diff --git a/rivetkit-typescript/packages/rivetkit/tests/driver/actor-db.test.ts b/rivetkit-typescript/packages/rivetkit/tests/driver/actor-db.test.ts
index ee1dd5935c..d9b19a9133 100644
--- a/rivetkit-typescript/packages/rivetkit/tests/driver/actor-db.test.ts
+++ b/rivetkit-typescript/packages/rivetkit/tests/driver/actor-db.test.ts
@@ -1,6 +1,6 @@
 // @ts-nocheck
 
-import { describe, expect, test, vi } from "vitest";
+import { describe, expect, test } from "vitest";
 import {
 	describeDriverMatrix,
 	SQLITE_DRIVER_MATRIX_OPTIONS,
@@ -13,6 +13,7 @@ const CHUNK_SIZE = 4096;
 const LARGE_PAYLOAD_SIZE = 32768;
 const HIGH_VOLUME_COUNT = 1000;
 const SLEEP_WAIT_MS = 150;
+const WASM_REMOTE_SLEEP_RECOVERY_TIMEOUT_MS = 30_000;
 const LIFECYCLE_POLL_INTERVAL_MS = 25;
 const LIFECYCLE_POLL_ATTEMPTS = 40;
 const REAL_TIMER_DB_TIMEOUT_MS = 180_000;
@@ -53,50 +54,50 @@ function isActorStoppingDbError(error: unknown): boolean {
 	);
 }
 
+async function retryActorStoppingDbError<T>(
+	driverTestConfig: DriverTestConfig,
+	fn: () => Promise<T>,
+	timeoutMs: number,
+): Promise<T> {
+	const deadline = Date.now() + timeoutMs;
+	for (;;) {
+		try {
+			return await fn();
+		} catch (error) {
+			if (!isActorStoppingDbError(error) || Date.now() >= deadline) {
+				throw error;
+			}
+			await waitFor(driverTestConfig, 100);
+		}
+	}
+}
+
 async function runWithActorStoppingRetry(
-	_driverTestConfig: DriverTestConfig,
+	driverTestConfig: DriverTestConfig,
 	fn: () => Promise<void>,
 ): Promise<void> {
-	// Wait for the actor to leave the `stopping` window. The driver does not
-	// surface a "ready again" signal, so we poll the user function and only
-	// retry on the specific `actor stopping: database accessed` error. Any
-	// other failure short-circuits.
-	await vi.waitFor(
-		async () => {
-			try {
-				await fn();
-			} catch (error) {
-				if (isActorStoppingDbError(error)) {
-					throw error;
-				}
-				throw new (class extends Error {
-					override name = "AbortRetry";
-				})(error instanceof Error ? error.message : String(error));
-			}
-		},
-		{ timeout: SLEEP_WAIT_MS * 4, interval: 100 },
+	await retryActorStoppingDbError(
+		driverTestConfig,
+		fn,
+		SLEEP_WAIT_MS * 4,
 	);
 }
 
 async function expectIntegrityCheckOk(
-	_driverTestConfig: DriverTestConfig,
+	driverTestConfig: DriverTestConfig,
 	integrityCheck: () => Promise<string>,
 ): Promise<void> {
 	// Same lifecycle window as `runWithActorStoppingRetry`: the integrity
 	// check is read-only against the SQLite db, so polling it does not hold
 	// the actor awake.
-	await vi.waitFor(
+	await retryActorStoppingDbError(
+		driverTestConfig,
 		async () => {
-			try {
-				expect((await integrityCheck()).toLowerCase()).toBe("ok");
-			} catch (error) {
-				if (isActorStoppingDbError(error)) {
-					throw error;
-				}
-				throw error;
-			}
+			expect((await integrityCheck()).toLowerCase()).toBe("ok");
 		},
-		{ timeout: SLEEP_WAIT_MS * 8, interval: 100 },
+		driverTestConfig.runtime === "wasm"
+			? WASM_REMOTE_SLEEP_RECOVERY_TIMEOUT_MS
+			: SLEEP_WAIT_MS * 8,
 	);
 }
 
@@ -276,6 +277,7 @@ describeDriverMatrix("Actor Db", (driverTestConfig) => {
 						expect(
 							sleepEvent.timestamp - sleepRequestedAt,
 						).toBeLessThanOrEqual(SLEEP_OBSERVER_TIMEOUT_MS);
+						await waitFor(driverTestConfig, SLEEP_WAIT_MS);
 
 						const countAfterWake = await actor.getCount();
 						expect(countAfterWake).toBe(baselineCount);
@@ -508,11 +510,18 @@ describeDriverMatrix("Actor Db", (driverTestConfig) => {
 						c,
 						driverTestConfig,
 					);
+					const actorKey = `db-${variant}-integrity-${crypto.randomUUID()}`;
+					const observerKey = `${actorKey}-observer`;
+					const observer = client.lifecycleObserver.getOrCreate([
+						observerKey,
+					]);
+					await observer.clearEvents();
 					const actor = getDbActor(client, variant).getOrCreate([
-						`db-${variant}-integrity-${crypto.randomUUID()}`,
+						actorKey,
 					]);
 
 					await actor.reset();
+					await actor.configureLifecycleObserver(observerKey);
 					await runWithActorStoppingRetry(
 						driverTestConfig,
 						async () =>
@@ -526,7 +535,15 @@ describeDriverMatrix("Actor Db", (driverTestConfig) => {
 						async () => await actor.integrityCheck(),
 					);
 
+					const sleepRequestedAt = Date.now();
 					await actor.triggerSleep();
+					await waitForDbLifecycleEvent(
+						driverTestConfig,
+						observer,
+						actorKey,
+						"sleep",
+						sleepRequestedAt,
+					);
 					await expectIntegrityCheckOk(
 						driverTestConfig,
 						async () => await actor.integrityCheck(),