diff --git a/packages/ai/CHANGELOG.md b/packages/ai/CHANGELOG.md
index 9c5eee224..42e8c8632 100644
--- a/packages/ai/CHANGELOG.md
+++ b/packages/ai/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+### Fixed
+
+- Fixed spawn-based lazy-loading tests (`oauth-barrel-import`, `auth-broker-wire-lazy-construction`, `cursor-transport-error`) flaking under CPU contention by giving each an explicit 60s per-test timeout instead of relying on bun's 5s default ([#7018](https://github.com/can1357/oh-my-pi/issues/7018)).
+
 ## [17.1.8] - 2026-07-28
 
 ### Fixed
diff --git a/packages/ai/test/auth-broker-wire-lazy-construction.test.ts b/packages/ai/test/auth-broker-wire-lazy-construction.test.ts
index f3ada7990..45594378b 100644
--- a/packages/ai/test/auth-broker-wire-lazy-construction.test.ts
+++ b/packages/ai/test/auth-broker-wire-lazy-construction.test.ts
@@ -34,4 +34,4 @@ test("auth-broker wire schemas construct only on first validation", async () =>
 	} finally {
 		await tempDir.remove().catch(() => {});
 	}
-});
+}, 60_000);
diff --git a/packages/ai/test/cursor-transport-error.test.ts b/packages/ai/test/cursor-transport-error.test.ts
index de9dfaebd..d8b214d87 100644
--- a/packages/ai/test/cursor-transport-error.test.ts
+++ b/packages/ai/test/cursor-transport-error.test.ts
@@ -20,5 +20,5 @@ describe("Cursor transport errors", () => {
 			eventTypes: ["start", "error"],
 			stopReason: "error",
 		});
-	});
+	}, 60_000);
 });
diff --git a/packages/ai/test/oauth-barrel-import.test.ts b/packages/ai/test/oauth-barrel-import.test.ts
index dcf511943..020b4e3b2 100644
--- a/packages/ai/test/oauth-barrel-import.test.ts
+++ b/packages/ai/test/oauth-barrel-import.test.ts
@@ -12,5 +12,5 @@ describe("OAuth barrel imports", () => {
 		const [exitCode, stderr] = await Promise.all([child.exited, new Response(child.stderr).text()]);
 
 		expect(exitCode, stderr).toBe(0);
-	});
+	}, 60_000);
 });
diff --git a/packages/catalog/CHANGELOG.md b/packages/catalog/CHANGELOG.md
index dac62c55e..bc4fbf65a 100644
--- a/packages/catalog/CHANGELOG.md
+++ b/packages/catalog/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+### Fixed
+
+- Fixed spawn-based lazy-loading tests (`bundled-reference-laziness`, `models-lazy-provider-cache`) flaking under CPU contention by giving each an explicit 60s per-test timeout instead of relying on bun's 5s default ([#7018](https://github.com/can1357/oh-my-pi/issues/7018)).
+
 ## [17.1.8] - 2026-07-28
 
 ### Added
diff --git a/packages/catalog/test/bundled-reference-laziness.test.ts b/packages/catalog/test/bundled-reference-laziness.test.ts
index fce6298e6..99a0908fb 100644
--- a/packages/catalog/test/bundled-reference-laziness.test.ts
+++ b/packages/catalog/test/bundled-reference-laziness.test.ts
@@ -14,7 +14,7 @@ describe("bundled reference laziness", () => {
 		expect(result.exitCode).toBe(0);
 		const { retainedRssBytes } = JSON.parse(result.stdout.toString()) as { retainedRssBytes: number };
 		expect(retainedRssBytes).toBeLessThan(8 * 1024 * 1024);
-	});
+	}, 60_000);
 
 	test("a provider-local reference hit retains less than 8 MiB of RSS", () => {
 		const result = Bun.spawnSync({
@@ -28,7 +28,7 @@ describe("bundled reference laziness", () => {
 		};
 		expect(resolvedId).not.toBeNull();
 		expect(retainedRssBytes).toBeLessThan(8 * 1024 * 1024);
-	});
+	}, 60_000);
 
 	test("a lazy provider-reference factory initializes on first resolution and only once", () => {
 		const reference = {
diff --git a/packages/catalog/test/models-lazy-provider-cache.test.ts b/packages/catalog/test/models-lazy-provider-cache.test.ts
index d5e623ee5..f09c178b3 100644
--- a/packages/catalog/test/models-lazy-provider-cache.test.ts
+++ b/packages/catalog/test/models-lazy-provider-cache.test.ts
@@ -8,4 +8,4 @@ test("bundled models are enriched one provider at a time", () => {
 		env: process.env,
 	});
 	expect(result.exitCode, result.stderr.toString()).toBe(0);
-});
+}, 60_000);
diff --git a/packages/coding-agent/CHANGELOG.md b/packages/coding-agent/CHANGELOG.md
index d97a1f633..35dd34a29 100644
--- a/packages/coding-agent/CHANGELOG.md
+++ b/packages/coding-agent/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+### Fixed
+
+- Fixed the spawn-based models config validator laziness test flaking under CPU contention by giving its two sequential probe processes an explicit 60s per-test timeout instead of sharing bun's 5s default ([#7018](https://github.com/can1357/oh-my-pi/issues/7018)).
+
 ## [17.1.8] - 2026-07-28
 
 ### Breaking Changes
diff --git a/packages/coding-agent/test/models-config-lazy-validator.test.ts b/packages/coding-agent/test/models-config-lazy-validator.test.ts
index bf0b0ae18..da2c51034 100644
--- a/packages/coding-agent/test/models-config-lazy-validator.test.ts
+++ b/packages/coding-agent/test/models-config-lazy-validator.test.ts
@@ -62,4 +62,4 @@ test("models config validation resources are retained only for a custom config",
 	} finally {
 		await tempDir.remove().catch(() => {});
 	}
-});
+}, 60_000);