diff --git a/go/internal/e2e/session_test.go b/go/internal/e2e/session_test.go
index 19e42e49..62183286 100644
--- a/go/internal/e2e/session_test.go
+++ b/go/internal/e2e/session_test.go
@@ -388,11 +388,7 @@ func TestSession(t *testing.T) {
 		}
 
 		// Resume using a new client
-		newClient := copilot.NewClient(&copilot.ClientOptions{
-			CLIPath: ctx.CLIPath,
-			Cwd:     ctx.WorkDir,
-			Env:     ctx.Env(),
-		})
+		newClient := ctx.NewClient()
 		defer newClient.ForceStop()
 
 		session2, err := newClient.ResumeSession(t.Context(), sessionID)
diff --git a/nodejs/test/e2e/session.test.ts b/nodejs/test/e2e/session.test.ts
index 8e086023..b3fba475 100644
--- a/nodejs/test/e2e/session.test.ts
+++ b/nodejs/test/e2e/session.test.ts
@@ -384,9 +384,9 @@ describe("Send Blocking Behavior", async () => {
         expect(events).toContain("assistant.message");
     });
 
-    // Skip in CI - this test validates client-side timeout behavior, not LLM responses.
-    // The test intentionally times out before receiving a response, so there's no snapshot to replay.
-    it.skipIf(process.env.CI === "true")("sendAndWait throws on timeout", async () => {
+    // This test validates client-side timeout behavior.
+    // The snapshot has no assistant response since we expect timeout before completion.
+    it("sendAndWait throws on timeout", async () => {
         const session = await client.createSession();
 
         // Use a slow command to ensure timeout triggers before completion
diff --git a/test/harness/replayingCapiProxy.ts b/test/harness/replayingCapiProxy.ts
index a700596b..1602ef2a 100644
--- a/test/harness/replayingCapiProxy.ts
+++ b/test/harness/replayingCapiProxy.ts
@@ -292,6 +292,7 @@ export class ReplayingCapiProxy extends CapturingHttpProxy {
             state.workDir,
             state.toolResultNormalizers,
           );
+          return;
         }
         super.performRequest(options);
       } catch (err) {