diff --git a/apps/server/src/provider/prime/PrimeAgentDaemonManager.test.ts b/apps/server/src/provider/prime/PrimeAgentDaemonManager.test.ts
index aecfc5082..ee2f0c00d 100644
--- a/apps/server/src/provider/prime/PrimeAgentDaemonManager.test.ts
+++ b/apps/server/src/provider/prime/PrimeAgentDaemonManager.test.ts
@@ -944,7 +944,9 @@ describe("PrimeAgentDaemonManager lifecycle", () => {
       shutdownRejects: true,
       shutdownDoesNotExit: true,
       postKillExitHangs: true,
-      shutdownTimeout: Duration.millis(5),
+      // This timeout also covers real private-socket cleanup before the exit wait.
+      // Leave room for filesystem scheduling under parallel CI load.
+      shutdownTimeout: Duration.millis(250),
     });
     return closeFixtureLive(fixture).pipe(
       Effect.andThen(
diff --git a/apps/server/src/sourceControl/PrTemplateDetection.test.ts b/apps/server/src/sourceControl/PrTemplateDetection.test.ts
index 5b91e6311..410981603 100644
--- a/apps/server/src/sourceControl/PrTemplateDetection.test.ts
+++ b/apps/server/src/sourceControl/PrTemplateDetection.test.ts
@@ -55,6 +55,9 @@ const runWithTempDirectory = <A, E, R>(
       const fileSystem = yield* FileSystem.FileSystem;
       const cwd = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-pr-template-" });
       yield* runGit(cwd, ["init", "--initial-branch=main"]);
+      // Auto maintenance may still write object packs after the scoped fixture
+      // starts removing this temporary repository under parallel CI load.
+      yield* runGit(cwd, ["config", "gc.auto", "0"]);
       yield* runGit(cwd, ["config", "user.email", "test@example.com"]);
       yield* runGit(cwd, ["config", "user.name", "Test User"]);
       return yield* test(cwd);