diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ae090c0590d..c75491cb0df 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,6 +2,12 @@ name: Build
 
 on:
   pull_request:
+    paths:
+      - "**.go"
+      - "**.gno"
+      - "go.mod"
+      - "go.sum"
+      - ".github/workflows/build.yml"
   push:
     branches:
       - master
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index b73a8a76c60..7e0b7f74d5f 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -2,6 +2,13 @@ name: Tests
 
 on:
   pull_request:
+    paths:
+      - "**.go"
+      - "**.gno"
+      - "go.mod"
+      - "go.sum"
+      - ".github/workflows/unit-tests.yml"
+      - "Makefile"
   push:
     branches:
       - master
@@ -14,16 +21,11 @@ jobs:
       matrix:
         goversion: ["1.17.x", "1.18.x"]
         args:
-          - ./tests/*.go -test.short -run "TestFileStr|TestPackages|TestSelectors" --timeout 20m
-          - ./tests/*.go -test.short -run "TestFiles1" --timeout 20m
-          - ./tests/*.go -test.short -run "TestFiles2" --timeout 20m
-          - ./tests/*.go -run "TestFiles/^zrealm" --timeout 20m
-          - ./tests/*.go -run "TestFiles1/^zrealm" --timeout 20m
-          - ./tests/*.go -run "TestFiles2/^zrealm" --timeout 20m
-          - ./tests/*.go -run "TestPackages" --timeout 20m
-          # temporarily disable the pkgs/... tests because some tests are flappy and
-          # we need to choose a good strategy to manage them.
-          # - ./pkgs/... -p 1 -count 1 --timeout 20m
+          - test.go
+          - test.files1
+          - test.files2
+          - test.realm
+          - test.packages
     runs-on: ubuntu-latest
     timeout-minutes: 21
     steps:
@@ -32,4 +34,4 @@ jobs:
           go-version: ${{ matrix.go-version }}
       - uses: actions/checkout@v3
       - name: test
-        run: go test ${{ matrix.args }}
+        run: make ${{ matrix.args }}