diff --git a/server/src/__tests__/approval-routes-idempotency.test.ts b/server/src/__tests__/approval-routes-idempotency.test.ts
index 676ae4ebbd..3937b0499a 100644
--- a/server/src/__tests__/approval-routes-idempotency.test.ts
+++ b/server/src/__tests__/approval-routes-idempotency.test.ts
@@ -1,6 +1,7 @@
 import express from "express";
 import request from "supertest";
 import { beforeEach, describe, expect, it, vi } from "vitest";
+import { hoistModuleGraph } from "./helpers/hoist-module-graph.js";
 
 const mockApprovalService = vi.hoisted(() => ({
   list: vi.fn(),
@@ -43,11 +44,14 @@ function registerModuleMocks() {
   }));
 }
 
+const routeModules = hoistModuleGraph(registerModuleMocks, async () => {
+  const { errorHandler } = await import("../middleware/index.js");
+  const { approvalRoutes } = await import("../routes/approvals.js");
+  return { errorHandler, approvalRoutes };
+});
+
 async function createApp(actorOverrides: Record<string, unknown> = {}) {
-  const [{ errorHandler }, { approvalRoutes }] = await Promise.all([
-    import("../middleware/index.js"),
-    import("../routes/approvals.js"),
-  ]);
+  const { errorHandler, approvalRoutes } = routeModules.value;
   const app = express();
   app.use(express.json());
   app.use((req, _res, next) => {
@@ -87,10 +91,7 @@ function createRouteDb(contextSnapshot: Record<string, unknown> = {}, runId = "r
 }
 
 async function createAgentApp(options: { runId?: string; contextSnapshot?: Record<string, unknown> } = {}) {
-  const [{ errorHandler }, { approvalRoutes }] = await Promise.all([
-    import("../middleware/index.js"),
-    import("../routes/approvals.js"),
-  ]);
+  const { errorHandler, approvalRoutes } = routeModules.value;
   const app = express();
   app.use(express.json());
   app.use((req, _res, next) => {
@@ -111,12 +112,6 @@ async function createAgentApp(options: { runId?: string; contextSnapshot?: Recor
 
 describe("approval routes idempotent retries", () => {
   beforeEach(() => {
-    vi.resetModules();
-    vi.doUnmock("../services/index.js");
-    vi.doUnmock("../routes/approvals.js");
-    vi.doUnmock("../routes/authz.js");
-    vi.doUnmock("../middleware/index.js");
-    registerModuleMocks();
     vi.clearAllMocks();
     mockApprovalService.list.mockReset();
     mockApprovalService.getById.mockReset();