diff --git a/src/agents/subagent-registry.mocks.shared.ts b/src/agents/subagent-registry.mocks.shared.ts
new file mode 100644
index 0000000000..6ef7d57a9c
--- /dev/null
+++ b/src/agents/subagent-registry.mocks.shared.ts
@@ -0,0 +1,15 @@
+import { vi } from "vitest";
+
+const noop = () => {};
+
+vi.mock("../gateway/call.js", () => ({
+  callGateway: vi.fn(async () => ({
+    status: "ok",
+    startedAt: 111,
+    endedAt: 222,
+  })),
+}));
+
+vi.mock("../infra/agent-events.js", () => ({
+  onAgentEvent: vi.fn(() => noop),
+}));
diff --git a/src/agents/subagent-registry.nested.test.ts b/src/agents/subagent-registry.nested.test.ts
index 2ff207a79b..3ab18ff328 100644
--- a/src/agents/subagent-registry.nested.test.ts
+++ b/src/agents/subagent-registry.nested.test.ts
@@ -1,18 +1,5 @@
 import { afterEach, describe, expect, it, vi } from "vitest";
-
-const noop = () => {};
-
-vi.mock("../gateway/call.js", () => ({
-  callGateway: vi.fn(async () => ({
-    status: "ok",
-    startedAt: 111,
-    endedAt: 222,
-  })),
-}));
-
-vi.mock("../infra/agent-events.js", () => ({
-  onAgentEvent: vi.fn(() => noop),
-}));
+import "./subagent-registry.mocks.shared.js";
 
 vi.mock("../config/config.js", () => ({
   loadConfig: vi.fn(() => ({
diff --git a/src/agents/subagent-registry.persistence.e2e.test.ts b/src/agents/subagent-registry.persistence.e2e.test.ts
index 38336ce6b5..9ef2458e35 100644
--- a/src/agents/subagent-registry.persistence.e2e.test.ts
+++ b/src/agents/subagent-registry.persistence.e2e.test.ts
@@ -2,6 +2,7 @@ import fs from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
 import { afterEach, describe, expect, it, vi } from "vitest";
+import "./subagent-registry.mocks.shared.js";
 import { captureEnv } from "../test-utils/env.js";
 import {
   initSubagentRegistry,
@@ -10,20 +11,6 @@ import {
 } from "./subagent-registry.js";
 import { loadSubagentRegistryFromDisk } from "./subagent-registry.store.js";
 
-const noop = () => {};
-
-vi.mock("../gateway/call.js", () => ({
-  callGateway: vi.fn(async () => ({
-    status: "ok",
-    startedAt: 111,
-    endedAt: 222,
-  })),
-}));
-
-vi.mock("../infra/agent-events.js", () => ({
-  onAgentEvent: vi.fn(() => noop),
-}));
-
 const { announceSpy } = vi.hoisted(() => ({
   announceSpy: vi.fn(async () => true),
 }));