diff --git a/packages/server/src/server/agent/providers/provider-windows-launch.test.ts b/packages/server/src/server/agent/providers/provider-windows-launch.test.ts
index b3af30ff4..29b6221e0 100644
--- a/packages/server/src/server/agent/providers/provider-windows-launch.test.ts
+++ b/packages/server/src/server/agent/providers/provider-windows-launch.test.ts
@@ -141,7 +141,7 @@ function withPathEntry<T>(dir: string, run: () => Promise<T>): Promise<T> {
 
 afterEach(() => {
   for (const dir of tempDirs.splice(0)) {
-    rmSync(dir, { recursive: true, force: true });
+    rmSync(dir, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 });
   }
 });
 
diff --git a/packages/server/src/server/session.test.ts b/packages/server/src/server/session.test.ts
index 3f20388e1..046f2b1e8 100644
--- a/packages/server/src/server/session.test.ts
+++ b/packages/server/src/server/session.test.ts
@@ -1180,9 +1180,6 @@ describe("session checkout pull request creation", () => {
         base: "main",
       },
       expect.anything(),
-      expect.objectContaining({
-        getCheckoutDiff: workspaceGitService.getCheckoutDiff,
-      }),
     );
     expect(messages).toContainEqual({
       type: "checkout_pr_create_response",
diff --git a/packages/server/src/server/workspace-git-service.test.ts b/packages/server/src/server/workspace-git-service.test.ts
index 966f3f91e..6d6c5a992 100644
--- a/packages/server/src/server/workspace-git-service.test.ts
+++ b/packages/server/src/server/workspace-git-service.test.ts
@@ -136,8 +136,9 @@ function createDirent(name: string, isDirectory: boolean) {
 }
 
 async function flushPromises(): Promise<void> {
-  await Promise.resolve();
-  await Promise.resolve();
+  for (let i = 0; i < 6; i++) {
+    await Promise.resolve();
+  }
 }
 
 function createDeferred<T>() {