diff --git a/src/agents/tools/cron-tool.e2e.test.ts b/src/agents/tools/cron-tool.e2e.test.ts
index b850f74ad..7b6d1310e 100644
--- a/src/agents/tools/cron-tool.e2e.test.ts
+++ b/src/agents/tools/cron-tool.e2e.test.ts
@@ -1,6 +1,15 @@
-import { beforeEach, describe, expect, it } from "vitest";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+const callGatewayMock = vi.fn();
+vi.mock("../../gateway/call.js", () => ({
+  callGateway: (opts: unknown) => callGatewayMock(opts),
+}));
+
+vi.mock("../agent-scope.js", () => ({
+  resolveSessionAgentId: () => "agent-123",
+}));
+
 import { createCronTool } from "./cron-tool.js";
-import { callGatewayMock, resetCronToolGatewayMock } from "./cron-tool.test-helpers.js";
 
 describe("cron tool", () => {
   async function executeAddAndReadDelivery(params: {
@@ -26,7 +35,8 @@ describe("cron tool", () => {
   }
 
   beforeEach(() => {
-    resetCronToolGatewayMock();
+    callGatewayMock.mockReset();
+    callGatewayMock.mockResolvedValue({ ok: true });
   });
 
   it.each([
diff --git a/src/agents/tools/cron-tool.flat-params.test.ts b/src/agents/tools/cron-tool.flat-params.test.ts
index cac2ac756..2a96b4510 100644
--- a/src/agents/tools/cron-tool.flat-params.test.ts
+++ b/src/agents/tools/cron-tool.flat-params.test.ts
@@ -1,10 +1,20 @@
-import { beforeEach, describe, expect, it } from "vitest";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+const callGatewayMock = vi.fn();
+vi.mock("../../gateway/call.js", () => ({
+  callGateway: (opts: unknown) => callGatewayMock(opts),
+}));
+
+vi.mock("../agent-scope.js", () => ({
+  resolveSessionAgentId: () => "agent-123",
+}));
+
 import { createCronTool } from "./cron-tool.js";
-import { callGatewayMock, resetCronToolGatewayMock } from "./cron-tool.test-helpers.js";
 
 describe("cron tool flat-params", () => {
   beforeEach(() => {
-    resetCronToolGatewayMock();
+    callGatewayMock.mockReset();
+    callGatewayMock.mockResolvedValue({ ok: true });
   });
 
   it("preserves explicit top-level sessionKey during flat-params recovery", async () => {