diff --git a/.github/workflows/test-and-build.yml b/.github/workflows/test-and-build.yml
index 27f4d2a..a260926 100644
--- a/.github/workflows/test-and-build.yml
+++ b/.github/workflows/test-and-build.yml
@@ -50,7 +50,17 @@ jobs:
       - name: Marking workdir safe
         run: git config --global --add safe.directory /__w/ots/ots
 
-      - name: Lint and test code
+      - name: 'Lint and test code: API'
+        run: |
+          go test -v ./...
+
+      - name: 'Lint and test code: Client'
+        working-directory: ./pkg/client
+        run: |
+          go test -v ./...
+
+      - name: 'Lint and test code: OBS-CLI'
+        working-directory: ./cmd/obs-cli
         run: |
           go test -v ./...