diff --git a/.github/workflows/test-upgrade.yml b/.github/workflows/test-upgrade.yml
index 248ca056d..19a3571ca 100644
--- a/.github/workflows/test-upgrade.yml
+++ b/.github/workflows/test-upgrade.yml
@@ -51,6 +51,11 @@ jobs:
         with:
           version: 'nightly'
 
+      - name: Install Komac Tool
+        shell: cmd
+        run: |
+          winget install komac --accept-source-agreements --accept-package-agreements --disable-interactivity
+
       - name: Test Nushell Upgrade
         shell: nu {0}
         env:
@@ -58,7 +63,6 @@ jobs:
         run: |
           use ${{ github.workspace }}/tests/test-all.nu *
           use ${{ github.workspace }}/tests/winget-install.nu [prepare-manifest]
-          winget install komac --accept-source-agreements --accept-package-agreements --disable-interactivity
           prepare-manifest
           test-winget-per-user-install
           test-winget-per-user-upgrade
diff --git a/.github/workflows/test-winget.yml b/.github/workflows/test-winget.yml
index 2ff112ea5..c1c43f351 100644
--- a/.github/workflows/test-winget.yml
+++ b/.github/workflows/test-winget.yml
@@ -52,12 +52,16 @@ jobs:
         with:
           version: 'nightly'
 
+      - name: Install Komac Tool
+        shell: cmd
+        run: |
+          winget install komac --accept-source-agreements --accept-package-agreements --disable-interactivity
+
       - name: Test Winget Install with Default Scope
         shell: nu {0}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          winget install komac --accept-source-agreements --accept-package-agreements --disable-interactivity
           nu tests/winget-install.nu
 
   user-scope:
@@ -78,12 +82,16 @@ jobs:
         with:
           version: 'nightly'
 
+      - name: Install Komac Tool
+        shell: cmd
+        run: |
+          winget install komac --accept-source-agreements --accept-package-agreements --disable-interactivity
+
       - name: Test Winget Install with User Scope
         shell: nu {0}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          winget install komac --accept-source-agreements --accept-package-agreements --disable-interactivity
           nu tests/winget-install.nu --scope user
 
   machine-scope:
@@ -104,10 +112,14 @@ jobs:
         with:
           version: 'nightly'
 
+      - name: Install Komac Tool
+        shell: cmd
+        run: |
+          winget install komac --accept-source-agreements --accept-package-agreements --disable-interactivity
+
       - name: Test Winget Install with Machine Scope
         shell: nu {0}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          winget install komac --accept-source-agreements --accept-package-agreements --disable-interactivity
           nu tests/winget-install.nu --scope machine