diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml
index 43bb005ddf..39282d195b 100644
--- a/.github/workflows/build-test.yaml
+++ b/.github/workflows/build-test.yaml
@@ -101,36 +101,44 @@ jobs:
     name: "Datastore Tests"
     runs-on: "ubuntu-latest"
     needs: "paths-filter"
-    if: |
-      needs.paths-filter.outputs.codechange == 'true'
     strategy:
       fail-fast: false
       matrix:
         datastore: ["crdb", "mysql", "postgres", "spanner"]
     steps:
       - uses: "actions/checkout@v3"
+        if: |
+          needs.paths-filter.outputs.codechange == 'true'
       - uses: "authzed/actions/setup-go@main"
+        if: |
+          needs.paths-filter.outputs.codechange == 'true'
         with:
           go-version: "${{ env.GO_VERSION }}"
       - name: "Integration tests"
+        if: |
+          needs.paths-filter.outputs.codechange == 'true'
         run: "go run mage.go testds:${{ matrix.datastore }}"
 
   datastoreconsistency:
     name: "Datastore Consistency Tests"
     runs-on: "ubuntu-latest"
     needs: "paths-filter"
-    if: |
-      needs.paths-filter.outputs.codechange == 'true'
     strategy:
       fail-fast: false
       matrix:
         datastore: ["crdb", "mysql", "postgres", "spanner"]
     steps:
       - uses: "actions/checkout@v3"
+        if: |
+          needs.paths-filter.outputs.codechange == 'true'
       - uses: "authzed/actions/setup-go@main"
+        if: |
+          needs.paths-filter.outputs.codechange == 'true'
         with:
           go-version: "${{ env.GO_VERSION }}"
       - name: "Integration tests"
+        if: |
+          needs.paths-filter.outputs.codechange == 'true'
         run: "go run mage.go testcons:${{ matrix.datastore }}"
 
   e2e: