diff --git a/.github/workflows/test-shard-template.yml b/.github/workflows/test-shard-template.yml
index cee452f3a59..f9c3b24f200 100644
--- a/.github/workflows/test-shard-template.yml
+++ b/.github/workflows/test-shard-template.yml
@@ -12,11 +12,16 @@ on:
       totalShards:
         required: true
         type: number
+      skip:
+        required: true
+        type: boolean
+        default: false
 
 jobs:
   test:
     name: Shard ${{ inputs.shard }} of ${{ inputs.totalShards }}
     runs-on: ubuntu-latest
+    if: ${{ inputs.skip == 'false' }}
     steps:
       - name: Check out Git repository
         uses: actions/checkout@v4.2.2
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index e151bff7104..f04a1987eff 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -31,7 +31,6 @@ jobs:
   run-tests:
     name: Run Tests
     needs: check-path-change-filter
-    if: ${{ needs.changes.outputs.all == 'true'}}
     strategy:
       matrix:
         shard: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
@@ -40,3 +39,4 @@ jobs:
       project: main
       shard: ${{ matrix.shard }}
       totalShards: 10
+      skip: ${{ needs.check-path-change-filter.outputs.all == 'false'}}