diff --git a/src/gateway/server-methods/system-agent-execution-lifecycle.test.ts b/src/gateway/server-methods/system-agent-execution-lifecycle.test.ts
index b44080240eac..b703c75159d2 100644
--- a/src/gateway/server-methods/system-agent-execution-lifecycle.test.ts
+++ b/src/gateway/server-methods/system-agent-execution-lifecycle.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it, vi } from "vitest";
-import { createDeferred } from "../../test-utils/deferred.js";
+import { createDeferred } from "../../shared/deferred.js";
 import {
   runSystemAgentGatewayMutationTask,
   runSystemAgentGatewayTask,
diff --git a/src/gateway/server-methods/system-agent-session-disposal.test.ts b/src/gateway/server-methods/system-agent-session-disposal.test.ts
index f57115159494..504b695b8718 100644
--- a/src/gateway/server-methods/system-agent-session-disposal.test.ts
+++ b/src/gateway/server-methods/system-agent-session-disposal.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it, vi } from "vitest";
-import { createDeferred } from "../../test-utils/deferred.js";
+import { createDeferred } from "../../shared/deferred.js";
 import { WizardSession } from "../../wizard/session.js";
 import {
   assertSystemAgentGatewayExecutionActive,
diff --git a/src/gateway/server-methods/system-agent-setup.test.ts b/src/gateway/server-methods/system-agent-setup.test.ts
index e6aee3265e0c..215b256fe256 100644
--- a/src/gateway/server-methods/system-agent-setup.test.ts
+++ b/src/gateway/server-methods/system-agent-setup.test.ts
@@ -6,13 +6,13 @@ import { getCommandLaneSnapshot } from "../../process/command-queue.js";
 import { resetCommandQueueStateForTest } from "../../process/command-queue.test-support.js";
 import { CommandLane } from "../../process/lanes.js";
 import { defaultRuntime } from "../../runtime.js";
+import { createDeferred } from "../../shared/deferred.js";
 import {
   createSystemAgentVerifiedInferenceTestFixture,
   installSystemAgentPluginMetadataTestSnapshot,
   type SystemAgentPluginMetadataTestSnapshot,
 } from "../../system-agent/system-agent.test-helpers.js";
 import type { SystemAgentVerifiedInferenceBinding } from "../../system-agent/verified-inference.js";
-import { createDeferred } from "../../test-utils/deferred.js";
 import {
   runExclusiveSystemAgentSetupActivation,
   whenAdmittedWizardSessionSettled,