diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 4125849..bad5373 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -24,7 +24,19 @@ jobs:
         with:
           name: holochain-ci
 
-      - name: Install and test
+      - name: Install NPM dependencies
         run: |
-          nix develop --command bash -c "npm i && npm t"
+          nix develop --command npm i
 
+      - name: Run Rust tests
+        run: |
+          nix develop --command cargo test
+
+      - name: Run Tryorama tests
+        run: |
+          nix develop --command npm test
+
+      - name: Run CLI tests
+        run: |
+          nix develop --command npm run test:cli
+      
diff --git a/package.json b/package.json
index d2f8af0..2569891 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,7 @@
     "package": "npm run build:happ && npm run package -w ui && hc web-app pack workdir --recursive",
     "build:happ": "npm run build:zomes && hc app pack workdir --recursive",
     "build:zomes": "RUSTFLAGS='' CARGO_TARGET_DIR=target cargo build --release --target wasm32-unknown-unknown",
+    "test:cli": "npm run build:happ && cargo test --manifest-path ./checked_cli/Cargo.toml",
     "lint": "npm run -w ui lint && npm run -w tests lint && cargo clippy && cargo clippy --manifest-path ./checked_cli/Cargo.toml",
     "format": "npm run -w ui format && npm run -w tests format && cargo fmt && cargo fmt --manifest-path ./checked_cli/Cargo.toml"
   },