diff --git a/packages/opencode/test/cli/acp/acp-test-client.ts b/packages/opencode/test/cli/acp/acp-test-client.ts
index 1588d344d7..343b2a6ba5 100644
--- a/packages/opencode/test/cli/acp/acp-test-client.ts
+++ b/packages/opencode/test/cli/acp/acp-test-client.ts
@@ -44,7 +44,7 @@ export function createAcpClient(acp: AcpHandle): AcpClient {
       yield* acp.send(message)
 
       while (true) {
-        const received = yield* acp.receive.pipe(Effect.timeout(Duration.seconds(15)))
+        const received = yield* acp.receive.pipe(Effect.timeout(Duration.seconds(30))) // kilocode_change
         if (isJsonRpcResponse<T>(received) && received.id === id) return received
       }
     })
diff --git a/packages/opencode/test/cli/acp/lifecycle.test.ts b/packages/opencode/test/cli/acp/lifecycle.test.ts
index 62948ade5c..4d0815aee3 100644
--- a/packages/opencode/test/cli/acp/lifecycle.test.ts
+++ b/packages/opencode/test/cli/acp/lifecycle.test.ts
@@ -18,7 +18,7 @@ describe("opencode acp lifecycle subprocess", () => {
         const acp = yield* opencode.acp()
         acp.close()
 
-        const code = yield* Effect.promise(() => acp.exited).pipe(Effect.timeout(Duration.seconds(5)))
+        const code = yield* Effect.promise(() => acp.exited).pipe(Effect.timeout(Duration.seconds(15))) // kilocode_change
         expect(code).toBe(0)
       }),
     60_000,