diff --git a/packages/server/src/server/agent/agent-self-identification.e2e.test.ts b/packages/server/src/server/agent/agent-self-identification.e2e.test.ts
index 57c1e87ba..a34f08f0d 100644
--- a/packages/server/src/server/agent/agent-self-identification.e2e.test.ts
+++ b/packages/server/src/server/agent/agent-self-identification.e2e.test.ts
@@ -8,7 +8,7 @@ import { randomUUID } from "node:crypto";
 import { createTestLogger } from "../../test-utils/test-logger.js";
 import { AgentManager } from "./agent-manager.js";
 import { AgentStorage } from "./agent-storage.js";
-import { createAgentMcpServer } from "./mcp-server.js";
+import { createAgentSelfIdMcpServer } from "./agent-self-id-mcp.js";
 import { createWorktree } from "../../utils/worktree.js";
 import type {
   AgentClient,
@@ -148,9 +148,8 @@ describe("self-identification MCP tools", () => {
         cwd: worktree.worktreePath,
       });
 
-      const server = await createAgentMcpServer({
+      const server = await createAgentSelfIdMcpServer({
         agentManager: manager,
-        agentStorage: storage,
         paseoHome,
         callerAgentId: agent.id,
         logger,
@@ -202,9 +201,8 @@ describe("self-identification MCP tools", () => {
         cwd: nestedDir,
       });
 
-      const server = await createAgentMcpServer({
+      const server = await createAgentSelfIdMcpServer({
         agentManager: manager,
-        agentStorage: storage,
         paseoHome,
         callerAgentId: agent.id,
         logger,
@@ -245,9 +243,8 @@ describe("self-identification MCP tools", () => {
         cwd: repoDir,
       });
 
-      const server = await createAgentMcpServer({
+      const server = await createAgentSelfIdMcpServer({
         agentManager: manager,
-        agentStorage: storage,
         callerAgentId: agent.id,
         logger,
       });
@@ -279,9 +276,8 @@ describe("self-identification MCP tools", () => {
         cwd: repoDir,
       });
 
-      const server = await createAgentMcpServer({
+      const server = await createAgentSelfIdMcpServer({
         agentManager: manager,
-        agentStorage: storage,
         callerAgentId: agent.id,
         logger,
       });
diff --git a/packages/server/src/server/agent/mcp-server.test.ts b/packages/server/src/server/agent/mcp-server.test.ts
index 24bb0a765..ef9e9fa17 100644
--- a/packages/server/src/server/agent/mcp-server.test.ts
+++ b/packages/server/src/server/agent/mcp-server.test.ts
@@ -2,6 +2,7 @@ import { describe, expect, it, vi } from "vitest";
 
 import { createTestLogger } from "../../test-utils/test-logger.js";
 import { createAgentMcpServer } from "./mcp-server.js";
+import { createAgentSelfIdMcpServer } from "./agent-self-id-mcp.js";
 import type { AgentManager, ManagedAgent } from "./agent-manager.js";
 import type { AgentStorage } from "./agent-storage.js";
 
@@ -104,14 +105,13 @@ describe("create_agent MCP tool", () => {
   });
 
   it("set_title trims and persists titles for caller agent", async () => {
-    const { agentManager, agentStorage, spies } = createTestDeps();
+    const { agentManager, spies } = createTestDeps();
     spies.agentManager.getAgent.mockReturnValue({
       id: "agent-1",
     } as ManagedAgent);
 
-    const server = await createAgentMcpServer({
+    const server = await createAgentSelfIdMcpServer({
       agentManager,
-      agentStorage,
       logger,
       callerAgentId: "agent-1",
     });