diff --git a/src/agents/pi-tool-definition-adapter.after-tool-call.e2e.test.ts b/src/agents/pi-tool-definition-adapter.after-tool-call.e2e.test.ts
index 5d442fc67..42784f1d7 100644
--- a/src/agents/pi-tool-definition-adapter.after-tool-call.e2e.test.ts
+++ b/src/agents/pi-tool-definition-adapter.after-tool-call.e2e.test.ts
@@ -66,14 +66,14 @@ function expectReadAfterToolCallPayload(result: Awaited<ReturnType<typeof execut
 
 describe("pi tool definition adapter after_tool_call", () => {
   beforeEach(() => {
-    hookMocks.runner.hasHooks.mockReset();
-    hookMocks.runner.runAfterToolCall.mockReset();
+    hookMocks.runner.hasHooks.mockClear();
+    hookMocks.runner.runAfterToolCall.mockClear();
     hookMocks.runner.runAfterToolCall.mockResolvedValue(undefined);
-    hookMocks.isToolWrappedWithBeforeToolCallHook.mockReset();
+    hookMocks.isToolWrappedWithBeforeToolCallHook.mockClear();
     hookMocks.isToolWrappedWithBeforeToolCallHook.mockReturnValue(false);
-    hookMocks.consumeAdjustedParamsForToolCall.mockReset();
+    hookMocks.consumeAdjustedParamsForToolCall.mockClear();
     hookMocks.consumeAdjustedParamsForToolCall.mockReturnValue(undefined);
-    hookMocks.runBeforeToolCallHook.mockReset();
+    hookMocks.runBeforeToolCallHook.mockClear();
     hookMocks.runBeforeToolCallHook.mockImplementation(async ({ params }) => ({
       blocked: false,
       params,
diff --git a/src/agents/tools/sessions.e2e.test.ts b/src/agents/tools/sessions.e2e.test.ts
index ea857a0f4..7a08d335d 100644
--- a/src/agents/tools/sessions.e2e.test.ts
+++ b/src/agents/tools/sessions.e2e.test.ts
@@ -134,7 +134,7 @@ describe("extractAssistantText", () => {
 
 describe("resolveAnnounceTarget", () => {
   beforeEach(async () => {
-    callGatewayMock.mockReset();
+    callGatewayMock.mockClear();
     await installRegistry();
   });
 
@@ -179,7 +179,7 @@ describe("resolveAnnounceTarget", () => {
 
 describe("sessions_list gating", () => {
   beforeEach(() => {
-    callGatewayMock.mockReset();
+    callGatewayMock.mockClear();
     callGatewayMock.mockResolvedValue({
       path: "/tmp/sessions.json",
       sessions: [
@@ -201,7 +201,7 @@ describe("sessions_list gating", () => {
 
 describe("sessions_send gating", () => {
   beforeEach(() => {
-    callGatewayMock.mockReset();
+    callGatewayMock.mockClear();
   });
 
   it("blocks cross-agent sends when tools.agentToAgent.enabled is false", async () => {
diff --git a/src/memory/qmd-manager.test.ts b/src/memory/qmd-manager.test.ts
index 8503616ea..d7b639e14 100644
--- a/src/memory/qmd-manager.test.ts
+++ b/src/memory/qmd-manager.test.ts
@@ -120,9 +120,9 @@ describe("QmdMemoryManager", () => {
   beforeEach(async () => {
     spawnMock.mockReset();
     spawnMock.mockImplementation(() => createMockChild());
-    logWarnMock.mockReset();
-    logDebugMock.mockReset();
-    logInfoMock.mockReset();
+    logWarnMock.mockClear();
+    logDebugMock.mockClear();
+    logInfoMock.mockClear();
     tmpRoot = path.join(fixtureRoot, `case-${fixtureCount++}`);
     await fs.mkdir(tmpRoot);
     workspaceDir = path.join(tmpRoot, "workspace");
@@ -1957,7 +1957,7 @@ describe("QmdMemoryManager", () => {
         await fs.rm(customModelsDir, { recursive: true, force: true });
         await fs.mkdir(defaultModelsDir, { recursive: true });
         await fs.writeFile(path.join(defaultModelsDir, "model.bin"), "fake-model");
-        logWarnMock.mockReset();
+        logWarnMock.mockClear();
         await testCase.setup?.();
         const { manager } = await createManager({ mode: "full" });
         expect(manager, testCase.name).toBeTruthy();