diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e5d8977d2..4b144c5e1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -88,9 +88,6 @@ jobs:
           node-version: '20'
           cache: 'npm'
 
-      - name: Fetch origin/main (worktree tests)
-        run: git fetch --no-tags origin main:refs/remotes/origin/main
-
       - name: Install dependencies
         run: npm install
 
@@ -100,11 +97,9 @@ jobs:
       - name: Build relay dependency
         run: npm run build --workspace=@getpaseo/relay
 
-      - name: Run server tests
-        run: npm run test --workspace=@getpaseo/server
-        env:
-          CLAUDE_CODE_OAUTH_TOKEN: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
-          OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
+      - name: Run Windows-critical server tests
+        working-directory: packages/server
+        run: npx vitest run src/utils/executable.test.ts src/utils/spawn.test.ts src/utils/run-git-command.test.ts src/server/agent/provider-registry.test.ts src/server/agent/provider-launch-config.test.ts src/server/agent/provider-snapshot-manager.test.ts src/server/persisted-config.test.ts
 
   app-tests:
     runs-on: ubuntu-latest