diff --git a/extensions/codex/src/app-server/run-attempt.test.ts b/extensions/codex/src/app-server/run-attempt.test.ts
index 1dde07c9ff37..02753bb86e40 100644
--- a/extensions/codex/src/app-server/run-attempt.test.ts
+++ b/extensions/codex/src/app-server/run-attempt.test.ts
@@ -3311,7 +3311,11 @@ describe("runCodexAppServerAttempt", () => {
     } finally {
       stopDiagnostics();
     }
-    expect(diagnosticEvents.map((event) => event.type)).toEqual([
+    expect(
+      diagnosticEvents
+        .filter((event) => event.type.startsWith("tool.execution."))
+        .map((event) => event.type),
+    ).toEqual([
       "tool.execution.started",
       "tool.execution.error",
     ]);
@@ -3367,7 +3371,11 @@ describe("runCodexAppServerAttempt", () => {
     } finally {
       stopDiagnostics();
     }
-    expect(diagnosticEvents.map((event) => event.type)).toEqual([
+    expect(
+      diagnosticEvents
+        .filter((event) => event.type.startsWith("tool.execution."))
+        .map((event) => event.type),
+    ).toEqual([
       "tool.execution.started",
       "tool.execution.completed",
     ]);