diff --git a/src/agents/openclaw-tools.subagents.sessions-spawn.lifecycle.e2e.test.ts b/src/agents/openclaw-tools.subagents.sessions-spawn.lifecycle.e2e.test.ts
index cf275cff0ae..737b374a7b5 100644
--- a/src/agents/openclaw-tools.subagents.sessions-spawn.lifecycle.e2e.test.ts
+++ b/src/agents/openclaw-tools.subagents.sessions-spawn.lifecycle.e2e.test.ts
@@ -150,11 +150,11 @@ const waitFor = async (predicate: () => boolean, timeoutMs = 2000) => {
 describe("openclaw-tools: subagents (sessions_spawn lifecycle)", () => {
   beforeEach(() => {
     resetSessionsSpawnConfigOverride();
+    resetSubagentRegistryForTests();
+    callGatewayMock.mockReset();
   });
 
   it("sessions_spawn runs cleanup flow after subagent completion", async () => {
-    resetSubagentRegistryForTests();
-    callGatewayMock.mockReset();
     const patchCalls: Array<{ key?: string; label?: string }> = [];
 
     const ctx = setupSessionsSpawnGatewayMock({
@@ -226,8 +226,6 @@ describe("openclaw-tools: subagents (sessions_spawn lifecycle)", () => {
   });
 
   it("sessions_spawn runs cleanup via lifecycle events", async () => {
-    resetSubagentRegistryForTests();
-    callGatewayMock.mockReset();
     let deletedKey: string | undefined;
     const ctx = setupSessionsSpawnGatewayMock({
       ...buildDiscordCleanupHooks((key) => {
@@ -312,8 +310,6 @@ describe("openclaw-tools: subagents (sessions_spawn lifecycle)", () => {
   });
 
   it("sessions_spawn deletes session when cleanup=delete via agent.wait", async () => {
-    resetSubagentRegistryForTests();
-    callGatewayMock.mockReset();
     let deletedKey: string | undefined;
     const ctx = setupSessionsSpawnGatewayMock({
       includeChatHistory: true,
@@ -372,8 +368,6 @@ describe("openclaw-tools: subagents (sessions_spawn lifecycle)", () => {
   });
 
   it("sessions_spawn reports timed out when agent.wait returns timeout", async () => {
-    resetSubagentRegistryForTests();
-    callGatewayMock.mockReset();
     const calls: Array<{ method?: string; params?: unknown }> = [];
     let agentCallCount = 0;
 
@@ -440,8 +434,6 @@ describe("openclaw-tools: subagents (sessions_spawn lifecycle)", () => {
   });
 
   it("sessions_spawn announces with requester accountId", async () => {
-    resetSubagentRegistryForTests();
-    callGatewayMock.mockReset();
     const calls: Array<{ method?: string; params?: unknown }> = [];
     let agentCallCount = 0;
     let childRunId: string | undefined;
diff --git a/src/agents/openclaw-tools.subagents.sessions-spawn.model.e2e.test.ts b/src/agents/openclaw-tools.subagents.sessions-spawn.model.e2e.test.ts
index 94c317fdde8..91d6b1c24f3 100644
--- a/src/agents/openclaw-tools.subagents.sessions-spawn.model.e2e.test.ts
+++ b/src/agents/openclaw-tools.subagents.sessions-spawn.model.e2e.test.ts
@@ -67,8 +67,6 @@ async function expectSpawnUsesConfiguredModel(params: {
   callId: string;
   expectedModel: string;
 }) {
-  resetSubagentRegistryForTests();
-  callGatewayMock.mockReset();
   if (params.config) {
     setSessionsSpawnConfigOverride(params.config);
   } else {
@@ -101,11 +99,11 @@ async function expectSpawnUsesConfiguredModel(params: {
 describe("openclaw-tools: subagents (sessions_spawn model + thinking)", () => {
   beforeEach(() => {
     resetSessionsSpawnConfigOverride();
+    resetSubagentRegistryForTests();
+    callGatewayMock.mockReset();
   });
 
   it("sessions_spawn applies a model to the child session", async () => {
-    resetSubagentRegistryForTests();
-    callGatewayMock.mockReset();
     const calls: GatewayCall[] = [];
     mockLongRunningSpawnFlow({ calls, acceptedAtBase: 3000 });
 
@@ -141,8 +139,6 @@ describe("openclaw-tools: subagents (sessions_spawn model + thinking)", () => {
   });
 
   it("sessions_spawn forwards thinking overrides to the agent run", async () => {
-    resetSubagentRegistryForTests();
-    callGatewayMock.mockReset();
     const calls: Array<{ method?: string; params?: unknown }> = [];
 
     callGatewayMock.mockImplementation(async (opts: unknown) => {
@@ -174,8 +170,6 @@ describe("openclaw-tools: subagents (sessions_spawn model + thinking)", () => {
   });
 
   it("sessions_spawn rejects invalid thinking levels", async () => {
-    resetSubagentRegistryForTests();
-    callGatewayMock.mockReset();
     const calls: Array<{ method?: string }> = [];
 
     callGatewayMock.mockImplementation(async (opts: unknown) => {
@@ -252,8 +246,6 @@ describe("openclaw-tools: subagents (sessions_spawn model + thinking)", () => {
   });
 
   it("sessions_spawn fails when model patch is rejected", async () => {
-    resetSubagentRegistryForTests();
-    callGatewayMock.mockReset();
     const calls: GatewayCall[] = [];
     mockLongRunningSpawnFlow({
       calls,
@@ -285,8 +277,6 @@ describe("openclaw-tools: subagents (sessions_spawn model + thinking)", () => {
   });
 
   it("sessions_spawn supports legacy timeoutSeconds alias", async () => {
-    resetSubagentRegistryForTests();
-    callGatewayMock.mockReset();
     let spawnedTimeout: number | undefined;
 
     callGatewayMock.mockImplementation(async (opts: unknown) => {