diff --git a/packages/app/e2e/fixtures.ts b/packages/app/e2e/fixtures.ts
index 7b1941319e..38b445a205 100644
--- a/packages/app/e2e/fixtures.ts
+++ b/packages/app/e2e/fixtures.ts
@@ -276,8 +276,8 @@ export const test = base.extend<TestFixtures, WorkerFixtures>({
     if (boundary) throw new Error(boundary)
   },
   directory: [
-    async ({}, use) => {
-      await use(await getWorktree())
+    async ({ backend }, use) => {
+      await use(await getWorktree(backend.url))
     },
     { scope: "worker" },
   ],
@@ -287,15 +287,15 @@ export const test = base.extend<TestFixtures, WorkerFixtures>({
     },
     { scope: "worker" },
   ],
-  sdk: async ({ directory }, use) => {
-    await use(createSdk(directory))
+  sdk: async ({ directory, backend }, use) => {
+    await use(backend.sdk(directory))
   },
-  gotoSession: async ({ page, directory }, use) => {
-    await seedStorage(page, { directory })
+  gotoSession: async ({ page, directory, backend }, use) => {
+    await seedStorage(page, { directory, serverUrl: backend.url })
 
     const gotoSession = async (sessionID?: string) => {
       await visit(page, sessionPath(directory, sessionID))
-      await waitSession(page, { directory, sessionID })
+      await waitSession(page, { directory, sessionID, serverUrl: backend.url })
     }
     await use(gotoSession)
   },
diff --git a/packages/opencode/test/lib/llm-server.ts b/packages/opencode/test/lib/llm-server.ts
index b3dd220c22..7bc3066e33 100644
--- a/packages/opencode/test/lib/llm-server.ts
+++ b/packages/opencode/test/lib/llm-server.ts
@@ -684,15 +684,6 @@ export class TestLLMServer extends ServiceMap.Service<TestLLMServer, TestLLMServ
           if (mode === "responses") return send(responses(auto, modelFrom(body)))
           return send(auto)
         }
-        // Auto-acknowledge tool-result follow-ups so tests only need to
-        // queue one response per tool call instead of two.
-        if (isToolResultFollowUp(body)) {
-          hits = [...hits, current]
-          yield* notify()
-          const auto: Sse = { type: "sse", head: [role()], tail: [textLine("ok"), finishLine("stop")] }
-          if (mode === "responses") return send(responses(auto, modelFrom(body)))
-          return send(auto)
-        }
         const next = pull(current)
         if (!next) {
           hits = [...hits, current]