diff --git a/src/agents/claude-cli-runner.e2e.test.ts b/src/agents/claude-cli-runner.e2e.test.ts
index 9df19c7a9..3999c2ef2 100644
--- a/src/agents/claude-cli-runner.e2e.test.ts
+++ b/src/agents/claude-cli-runner.e2e.test.ts
@@ -1,5 +1,4 @@
 import { beforeEach, describe, expect, it, vi } from "vitest";
-import { sleep } from "../utils.js";
 import { runClaudeCliAgent } from "./claude-cli-runner.js";
 
 const mocks = vi.hoisted(() => ({
@@ -65,13 +64,12 @@ function successExit(payload: { message: string; session_id: string }) {
 }
 
 async function waitForCalls(mockFn: { mock: { calls: unknown[][] } }, count: number) {
-  for (let i = 0; i < 50; i += 1) {
-    if (mockFn.mock.calls.length >= count) {
-      return;
-    }
-    await sleep(0);
-  }
-  throw new Error(`Expected ${count} calls, got ${mockFn.mock.calls.length}`);
+  await vi.waitFor(
+    () => {
+      expect(mockFn.mock.calls.length).toBeGreaterThanOrEqual(count);
+    },
+    { timeout: 2_000, interval: 5 },
+  );
 }
 
 describe("runClaudeCliAgent", () => {