diff --git a/cli/src/__tests__/cli-entry-edge-cases.test.ts b/cli/src/__tests__/cli-entry-edge-cases.test.ts
index a933f684..07c71124 100644
--- a/cli/src/__tests__/cli-entry-edge-cases.test.ts
+++ b/cli/src/__tests__/cli-entry-edge-cases.test.ts
@@ -33,7 +33,7 @@ function runCli(
     const stdout = execSync(cmd, {
       cwd: PROJECT_ROOT,
       env: {
-        PATH: process.env.PATH,
+        PATH: `${process.env.HOME}/.bun/bin:${process.env.PATH}`,
         HOME: process.env.HOME,
         SHELL: process.env.SHELL,
         TERM: process.env.TERM || "xterm",
diff --git a/cli/src/__tests__/cli-version-and-dispatch.test.ts b/cli/src/__tests__/cli-version-and-dispatch.test.ts
index 44350a89..1d204e8f 100644
--- a/cli/src/__tests__/cli-version-and-dispatch.test.ts
+++ b/cli/src/__tests__/cli-version-and-dispatch.test.ts
@@ -40,6 +40,8 @@ function runCLI(
     timeout: 15000,
     env: {
       ...process.env,
+      // Ensure bun is in PATH for child processes
+      PATH: `${process.env.HOME}/.bun/bin:${process.env.PATH}`,
       SPAWN_NO_UPDATE_CHECK: "1",
       BUN_ENV: "test",
       // Avoid terminal-dependent output
diff --git a/cli/src/__tests__/cmdrun-resolution.test.ts b/cli/src/__tests__/cmdrun-resolution.test.ts
index eaf710c0..6120c5a4 100644
--- a/cli/src/__tests__/cmdrun-resolution.test.ts
+++ b/cli/src/__tests__/cmdrun-resolution.test.ts
@@ -30,7 +30,7 @@ function runCli(
     const stdout = execSync(cmd, {
       cwd: PROJECT_ROOT,
       env: {
-        PATH: process.env.PATH,
+        PATH: `${process.env.HOME}/.bun/bin:${process.env.PATH}`,
         HOME: process.env.HOME,
         SHELL: process.env.SHELL,
         TERM: process.env.TERM || "xterm",
diff --git a/cli/src/__tests__/index-main-routing.test.ts b/cli/src/__tests__/index-main-routing.test.ts
index b956bf70..9f2c6dad 100644
--- a/cli/src/__tests__/index-main-routing.test.ts
+++ b/cli/src/__tests__/index-main-routing.test.ts
@@ -31,6 +31,8 @@ function runCli(
       env: {
         ...process.env,
         ...env,
+        // Ensure bun is in PATH for child processes
+        PATH: `${process.env.HOME}/.bun/bin:${process.env.PATH}`,
         // Prevent auto-update from running during tests
         SPAWN_NO_UPDATE_CHECK: "1",
         // Prevent local manifest.json from being used
diff --git a/cli/src/__tests__/no-cloud-error-paths.test.ts b/cli/src/__tests__/no-cloud-error-paths.test.ts
index 6803d9f2..da79b8f0 100644
--- a/cli/src/__tests__/no-cloud-error-paths.test.ts
+++ b/cli/src/__tests__/no-cloud-error-paths.test.ts
@@ -34,7 +34,7 @@ function runCli(
     const stdout = execSync(cmd, {
       cwd: PROJECT_ROOT,
       env: {
-        PATH: process.env.PATH,
+        PATH: `${process.env.HOME}/.bun/bin:${process.env.PATH}`,
         HOME: process.env.HOME,
         SHELL: process.env.SHELL,
         TERM: process.env.TERM || "xterm",
diff --git a/cli/src/__tests__/prompt-file-errors.test.ts b/cli/src/__tests__/prompt-file-errors.test.ts
index 830c227a..f20e8a15 100644
--- a/cli/src/__tests__/prompt-file-errors.test.ts
+++ b/cli/src/__tests__/prompt-file-errors.test.ts
@@ -39,7 +39,7 @@ function runCli(
     const stdout = execSync(cmd, {
       cwd: PROJECT_ROOT,
       env: {
-        PATH: process.env.PATH,
+        PATH: `${process.env.HOME}/.bun/bin:${process.env.PATH}`,
         HOME: process.env.HOME,
         SHELL: process.env.SHELL,
         TERM: process.env.TERM || "xterm",
diff --git a/cli/src/__tests__/show-info-or-error.test.ts b/cli/src/__tests__/show-info-or-error.test.ts
index 9d98e7b5..038fdb45 100644
--- a/cli/src/__tests__/show-info-or-error.test.ts
+++ b/cli/src/__tests__/show-info-or-error.test.ts
@@ -37,7 +37,7 @@ function runCli(
       cwd: PROJECT_ROOT,
       env: {
         // Start with clean env to avoid bun test's NODE_ENV=test leaking
-        PATH: process.env.PATH,
+        PATH: `${process.env.HOME}/.bun/bin:${process.env.PATH}`,
         HOME: process.env.HOME,
         SHELL: process.env.SHELL,
         TERM: process.env.TERM || "xterm",