diff --git a/.github/workflows/cli_tests.yml b/.github/workflows/cli_tests.yml
new file mode 100644
index 000000000..8bd3bb8ec
--- /dev/null
+++ b/.github/workflows/cli_tests.yml
@@ -0,0 +1,41 @@
+name: CLI Tests
+
+on:
+  push:
+    paths:
+      - "cli/**"
+  pull_request:
+    paths:
+      - "cli/**"
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./cli
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: package.json
+          cache: npm
+
+      - name: Install dependencies
+        run: |
+          cd ..
+          npm ci --ignore-scripts
+
+      - 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
+        env:
+          NPM_CONFIG_YES: true
+          CI: true
diff --git a/cli/scripts/cli-tests.js b/cli/scripts/cli-tests.js
index 0c5a6f2d3..68ce3885c 100755
--- a/cli/scripts/cli-tests.js
+++ b/cli/scripts/cli-tests.js
@@ -12,7 +12,7 @@ const colors = {
 
 import fs from "fs";
 import path from "path";
-import { execSync, spawn } from "child_process";
+import { spawn } from "child_process";
 import os from "os";
 import { fileURLToPath } from "url";
 
diff --git a/cli/src/cli.ts b/cli/src/cli.ts
index de0153b0c..f29743abb 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);
     }
diff --git a/cli/src/index.ts b/cli/src/index.ts
index 5d5dcf8b9..2b0c4f53d 100644
--- a/cli/src/index.ts
+++ b/cli/src/index.ts
@@ -287,6 +287,8 @@ async function main(): Promise<void> {
   try {
     const args = parseArgs();
     await callMethod(args);
+    // Explicitly exit to ensure process terminates in CI
+    process.exit(0);
   } catch (error) {
     handleError(error);
   }