diff --git a/extensions/qa-lab/src/suite-runtime-agent-process.test.ts b/extensions/qa-lab/src/suite-runtime-agent-process.test.ts
index dae6c2ad484..a3527eea4d1 100644
--- a/extensions/qa-lab/src/suite-runtime-agent-process.test.ts
+++ b/extensions/qa-lab/src/suite-runtime-agent-process.test.ts
@@ -698,7 +698,7 @@ describe("qa suite runtime agent process helpers", () => {
 
     expect(gatewayCall).toHaveBeenCalledWith(
       "agent.wait",
-      { runId: "run-oversized", timeoutMs: 9e15 },
+      { runId: "run-oversized", timeoutMs: MAX_TIMER_TIMEOUT_MS },
       { timeoutMs: MAX_TIMER_TIMEOUT_MS },
     );
   });
diff --git a/extensions/qa-lab/src/suite-runtime-agent-process.ts b/extensions/qa-lab/src/suite-runtime-agent-process.ts
index 14a5ca4b293..96691351c3d 100644
--- a/extensions/qa-lab/src/suite-runtime-agent-process.ts
+++ b/extensions/qa-lab/src/suite-runtime-agent-process.ts
@@ -347,15 +347,16 @@ async function waitForAgentRun(
   runId: string,
   timeoutMs = 30_000,
 ) {
+  const waitTimeoutMs = resolveTimerTimeoutMs(timeoutMs, 30_000);
   try {
     return (await env.gateway.call(
       "agent.wait",
       {
         runId,
-        timeoutMs,
+        timeoutMs: waitTimeoutMs,
       },
       {
-        timeoutMs: resolveQaGatewayTimeoutWithGraceMs(timeoutMs),
+        timeoutMs: resolveQaGatewayTimeoutWithGraceMs(waitTimeoutMs),
       },
     )) as { status?: string; error?: string };
   } catch (error) {