diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 80ed9d7..72353b2 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,5 +8,7 @@ jobs:
     steps:
     - name: Checkout repository
       uses: actions/checkout@v2
-    - name: Test
-      run: ./test.sh
+    - name: Run CLI tests
+      run:
+      - cd test;
+      - run.sh cli
diff --git a/test/_setup.sh b/test/cli/_setup.sh
similarity index 82%
rename from test/_setup.sh
rename to test/cli/_setup.sh
index dfc1be0..e04e171 100644
--- a/test/_setup.sh
+++ b/test/cli/_setup.sh
@@ -1,4 +1,4 @@
-export PATH=$(dirname "$0")/../src:$PATH
+export PATH=$(dirname "$0")/../../src:$PATH
 
 export test_tempdir="/tmp/lifecap-tests-$$"
 mkdir -p "$test_tempdir"
diff --git a/test/_teardown.sh b/test/cli/_teardown.sh
similarity index 100%
rename from test/_teardown.sh
rename to test/cli/_teardown.sh
diff --git a/test/cli/topic/test_add_topic.sh b/test/cli/topic/test_add_topic.sh
deleted file mode 100644
index e44c8e2..0000000
--- a/test/cli/topic/test_add_topic.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-lifecap topic add test-topic
-
-find $test_tempdir*
-
-__assert "$(lifecap topic ls)" "=" "test-topic"