diff --git a/.github/workflows/cli_tests.yml b/.github/workflows/cli_tests.yml
index 3ea0f0e7..6f199518 100644
--- a/.github/workflows/cli_tests.yml
+++ b/.github/workflows/cli_tests.yml
@@ -31,5 +31,8 @@ jobs:
       - name: Build CLI
         run: npm run build
 
+      - name: Explicitly pre-install test dependencies
+        run: npx -y @modelcontextprotocol/server-everything --help || true
+
       - name: Run tests
         run: npm test
diff --git a/cli/src/cli.ts b/cli/src/cli.ts
index de0153b0..f29743ab 100644
--- a/cli/src/cli.ts
+++ b/cli/src/cli.ts
@@ -233,7 +233,7 @@ async function main(): Promise<void> {
     const args = parseArgs();
 
     if (args.cli) {
-      runCli(args);
+      await runCli(args);
     } else {
       await runWebClient(args);
     }