diff --git a/src/gateway/test/agent-command-helpers.ts b/src/gateway/agent-command.test-helpers.ts
similarity index 93%
rename from src/gateway/test/agent-command-helpers.ts
rename to src/gateway/agent-command.test-helpers.ts
index 4587e7b9616..f071a6a8805 100644
--- a/src/gateway/test/agent-command-helpers.ts
+++ b/src/gateway/agent-command.test-helpers.ts
@@ -1,5 +1,5 @@
 import { vi } from "vitest";
-import { agentCommand } from "../test-helpers.runtime-state.js";
+import { agentCommand } from "./test-helpers.runtime-state.js";
 
 export type AgentCommandCall = Record<string, unknown>;
 
diff --git a/src/gateway/server.agent.gateway-server-agent-a.test.ts b/src/gateway/server.agent.gateway-server-agent-a.test.ts
index ffe9b3f7fa4..05f21de8ee0 100644
--- a/src/gateway/server.agent.gateway-server-agent-a.test.ts
+++ b/src/gateway/server.agent.gateway-server-agent-a.test.ts
@@ -4,6 +4,7 @@ import path from "node:path";
 import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vitest";
 import type { ChannelPlugin } from "../channels/plugins/types.js";
 import { createChannelTestPluginBase } from "../test-utils/channel-plugins.js";
+import { waitForAgentCommandCall } from "./agent-command.test-helpers.js";
 import { setRegistry } from "./server.agent.gateway-server-agent.mocks.js";
 import { createRegistry } from "./server.e2e-registry-helpers.js";
 import {
@@ -15,7 +16,6 @@ import {
   testState,
   writeSessionStore,
 } from "./test-helpers.js";
-import { waitForAgentCommandCall } from "./test/agent-command-helpers.js";
 
 installGatewayTestHooks({ scope: "suite" });
 
diff --git a/src/gateway/server.agent.gateway-server-agent-b.test.ts b/src/gateway/server.agent.gateway-server-agent-b.test.ts
index 6f3222b81a2..32d6f7712d0 100644
--- a/src/gateway/server.agent.gateway-server-agent-b.test.ts
+++ b/src/gateway/server.agent.gateway-server-agent-b.test.ts
@@ -6,6 +6,7 @@ import { WebSocket } from "ws";
 import type { ChannelPlugin } from "../channels/plugins/types.js";
 import { emitAgentEvent, registerAgentRunContext } from "../infra/agent-events.js";
 import { createChannelTestPluginBase } from "../test-utils/channel-plugins.js";
+import { readAgentCommandCall } from "./agent-command.test-helpers.js";
 import { setRegistry } from "./server.agent.gateway-server-agent.mocks.js";
 import { createRegistry } from "./server.e2e-registry-helpers.js";
 import {
@@ -22,7 +23,6 @@ import {
   withGatewayServer,
   writeSessionStore,
 } from "./test-helpers.js";
-import { readAgentCommandCall } from "./test/agent-command-helpers.js";
 
 installGatewayTestHooks({ scope: "suite" });