diff --git a/cli/package.json b/cli/package.json
index bf344733..336e34e1 100644
--- a/cli/package.json
+++ b/cli/package.json
@@ -17,7 +17,9 @@
   "scripts": {
     "build": "tsc",
     "postbuild": "node scripts/make-executable.js",
-    "test": "node scripts/cli-tests.js"
+    "test": "node scripts/cli-tests.js && node scripts/cli-tool-tests.js",
+    "test:cli": "node scripts/cli-tests.js",
+    "test:cli-tools": "node scripts/cli-tool-tests.js"
   },
   "devDependencies": {},
   "dependencies": {