@@ -24,6 +24,7 @@ import * as Fiber from "effect/Fiber";
 import * as Logger from "effect/Logger";
 import * as Option from "effect/Option";
 import * as Schema from "effect/Schema";
+import * as TestClock from "effect/testing/TestClock";
 
 import * as MobileDatabase from "../persistence/mobile-database";
 import { make } from "./environment-cache-store";
@@ -567,7 +568,7 @@ describe("mobile SQLite environment cache store", () => {
     }),
   );
 
-  it.live("returns cached threads before their pull request links, which load after", () =>
+  it.effect("returns cached threads before their pull request links, which load after", () =>
     Effect.gen(function* () {
       const memory = makeDatabase();
       const store = yield* make().pipe(
@@ -592,12 +593,13 @@ describe("mobile SQLite environment cache store", () => {
 
       const shell = Option.getOrThrow(yield* store.loadShell(ENVIRONMENT_ID));
       expect(shell.threads.map((thread) => thread.pullRequests)).toEqual([undefined, undefined]);
-      const links = yield* shell.loadPullRequests!;
-      expect([...links]).toEqual([[THREAD_ID, [link]]]);
+      const links = yield* Effect.forkChild(shell.loadPullRequests!);
+      yield* TestClock.adjust("1 millis");
+      expect([...(yield* Fiber.join(links))]).toEqual([[THREAD_ID, [link]]]);
     }),
   );
 
-  it.live("keeps cached threads when their pull request links cannot be read", () => {
+  it.effect("keeps cached threads when their pull request links cannot be read", () => {
     const messages: Array<unknown> = [];
     const logger = Logger.make(({ message }) => {
       messages.push(message);
@@ -633,7 +635,9 @@ describe("mobile SQLite environment cache store", () => {
 
       const shell = Option.getOrThrow(yield* store.loadShell(ENVIRONMENT_ID));
       expect(shell.threads.map((thread) => thread.id)).toEqual([THREAD_ID, readable.id]);
-      expect([...(yield* shell.loadPullRequests!)]).toEqual([[readable.id, [link]]]);
+      const links = yield* Effect.forkChild(shell.loadPullRequests!);
+      yield* TestClock.adjust("1 millis");
+      expect([...(yield* Fiber.join(links))]).toEqual([[readable.id, [link]]]);
       expect(messages).toHaveLength(1);
       expect(memory.removed).toEqual([]);
     }).pipe(Effect.provide(Logger.layer([logger], { mergeWithExisting: false })));
 
@@ -193,7 +193,7 @@ const authorizeParams = (clientId: string, redirect = "http://localhost:51234/ca
   resource: `${ORIGIN}/mcp`,
 });
 
-it.live("derives discovery metadata from the origin the client reached", () =>
+it.effect("derives discovery metadata from the origin the client reached", () =>
   withRoutes((handler) =>
     Effect.gen(function* () {
       const resource = yield* handler(at("/.well-known/oauth-protected-resource/mcp"));
@@ -215,7 +215,7 @@ it.live("derives discovery metadata from the origin the client reached", () =>
   ),
 );
 
-it.live("registers loopback and https clients and never redirects for an unverified client", () =>
+it.effect("registers loopback and https clients and never redirects for an unverified client", () =>
   withRoutes((handler) =>
     Effect.gen(function* () {
       for (const refused of [
@@ -622,7 +622,7 @@ it.live("an app approval code approves only an app sign-in, at its own level", (
   ),
 );
 
-it.live(
+it.effect(
   "sends an app sign-in on the linked tunnel to the hosted app, and a link to its own page",
   () =>
     Effect.gen(function* () {
 
@@ -2202,7 +2202,7 @@ describe("OrchestratorMcpService provider resolution", () => {
       }),
   );
 
-  it.live.each([
+  it.effect.each([
     { name: "parent instance", parentEnabled: true, model: "gpt-5.4" },
     { name: "alternate instance", parentEnabled: false, model: "gpt-5.5" },
   ])(
 
@@ -101,7 +101,7 @@ describe("tailClaudeTaskOutput", () => {
     ).pipe(Effect.provide(NodeServices.layer)),
   );
 
-  it.live("reads what was written last when the tool result stops it", () =>
+  it.effect("reads what was written last when the tool result stops it", () =>
     Effect.scoped(
       Effect.gen(function* () {
         const fileSystem = yield* FileSystem.FileSystem;