diff --git a/.github/workflows/test-vscode.yml b/.github/workflows/test-vscode.yml
index aa44a16251..a19617ef32 100644
--- a/.github/workflows/test-vscode.yml
+++ b/.github/workflows/test-vscode.yml
@@ -53,27 +53,3 @@ jobs:
       - name: Check for kilocode_change markers
         working-directory: packages/kilo-vscode
         run: bun run check-kilocode-change
-
-  # kilocode_change start
-  windows-worktree:
-    name: Windows worktree cleanup
-    runs-on: blacksmith-4vcpu-windows-2025
-    timeout-minutes: 20
-    defaults:
-      run:
-        shell: bash
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v6
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Setup Bun
-        uses: ./.github/actions/setup-bun
-
-      - name: Run Windows worktree cleanup tests
-        working-directory: packages/kilo-vscode
-        run: |
-          bun test tests/unit/worktree-manager.test.ts --test-name-pattern "Windows|directory remains locked" --timeout 30000
-          bun test tests/unit/session-terminal-manager.test.ts tests/unit/pty-cleanup.test.ts tests/unit/run-script-manager.test.ts --timeout 30000
-  # kilocode_change end
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4329acf219..d755a3befe 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -200,6 +200,11 @@ jobs:
         run: |
           bun test test/server/httpapi-pty.test.ts --test-name-pattern "serves Agent Manager regular terminal" --timeout 60000
           bun test test/server/httpapi-v2-pty.test.ts --test-name-pattern "serves Agent Manager script terminal" --timeout 60000
+
+      - name: Run Windows worktree cleanup regression
+        if: matrix.settings.run && matrix.settings.pty && runner.os == 'Windows'
+        working-directory: packages/kilo-vscode
+        run: bun test tests/unit/worktree-manager.test.ts --test-name-pattern "keeps a Windows worktree tracked while a live process locks its directory" --timeout 30000
       # kilocode_change end
       # kilocode_change start - ensure the Darwin profile cannot suppress its own validation
       - name: Validate Darwin CLI test profile