diff --git a/src/agents/pi-embedded-runner.openai-tool-id-preservation.test.ts b/src/agents/pi-embedded-runner.openai-tool-id-preservation.test.ts
index e611a7464ca..0476df4803d 100644
--- a/src/agents/pi-embedded-runner.openai-tool-id-preservation.test.ts
+++ b/src/agents/pi-embedded-runner.openai-tool-id-preservation.test.ts
@@ -1,13 +1,32 @@
 import type { AgentMessage } from "@mariozechner/pi-agent-core";
-import { describe, expect, it } from "vitest";
+import { beforeEach, describe, expect, it, vi } from "vitest";
 import {
+  loadSanitizeSessionHistoryWithCleanMocks,
   makeInMemorySessionManager,
   makeModelSnapshotEntry,
+  type SanitizeSessionHistoryHarness,
 } from "./pi-embedded-runner.sanitize-session-history.test-harness.js";
-import { sanitizeSessionHistory } from "./pi-embedded-runner/replay-history.js";
 import { castAgentMessage } from "./test-helpers/agent-message-fixtures.js";
 
+vi.mock("./pi-embedded-helpers.js", async () => ({
+  ...(await vi.importActual("./pi-embedded-helpers.js")),
+  sanitizeSessionMessagesImages: vi.fn(async (msgs) => msgs),
+}));
+
+vi.mock("../plugins/provider-runtime.js", () => ({
+  resolveProviderRuntimePlugin: vi.fn(() => undefined),
+  sanitizeProviderReplayHistoryWithPlugin: vi.fn(() => undefined),
+  validateProviderReplayTurnsWithPlugin: vi.fn(() => undefined),
+}));
+
 describe("sanitizeSessionHistory openai tool id preservation", () => {
+  let sanitizeSessionHistory: SanitizeSessionHistoryHarness["sanitizeSessionHistory"];
+
+  beforeEach(async () => {
+    const harness = await loadSanitizeSessionHistoryWithCleanMocks();
+    sanitizeSessionHistory = harness.sanitizeSessionHistory;
+  });
+
   const makeSessionManager = () =>
     makeInMemorySessionManager([
       makeModelSnapshotEntry({