diff --git a/.github/workflows/aws_tfhe_tests.yml b/.github/workflows/aws_tfhe_tests.yml
index ab5ccf337a..6dfc22e4e2 100644
--- a/.github/workflows/aws_tfhe_tests.yml
+++ b/.github/workflows/aws_tfhe_tests.yml
@@ -36,7 +36,7 @@ jobs:
       csprng_test: ${{ steps.changed-files.outputs.csprng_any_changed }}
       apps_test: ${{ steps.changed-files.outputs.apps_any_changed }}
       user_docs_test: ${{ steps.changed-files.outputs.user_docs_any_changed }}
-      any_file_changed: ${{ steps.changed-files.outputs.any_changed }}
+      any_file_changed: ${{ steps.aggregated-changes.outputs.any_changed }}
     steps:
       - name: Checkout tfhe-rs
         uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b
@@ -71,6 +71,18 @@ jobs:
               - tfhe/docs/**
               - README.md
 
+      - name: Aggregate file changes
+        id: aggregated-changes
+        run: |
+          if [[ 
+            ${{ steps.changed-files.outputs.boolean_any_changed }} = "true" ||
+            ${{ steps.changed-files.outputs.c_api_any_changed }} = "true"
+          ]]; then
+            echo "any_changed=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "any_changed=false" >> "$GITHUB_OUTPUT"
+          fi
+
       - name: Echo results
         run: |
           echo "core_crypto_test: ${{ steps.changed-files.outputs.core_crypto_any_changed }}"
@@ -88,7 +100,7 @@ jobs:
 
   setup-instance:
     name: Setup instance (cpu-tests)
-    #if: ${{ github.event_name == 'pull_request' && needs.file-change.outputs.any_file_changed == 'true' }}
+    if: ${{ github.event_name == 'pull_request' && needs.file-change.outputs.any_file_changed == 'true' }}
     ###############if: ${{ github.event_name == 'workflow_dispatch' || contains(github.event.label.name, 'approved') }}
     needs: file-change
     runs-on: ubuntu-latest