diff --git a/.github/workflows/broker-build-test.yml b/.github/workflows/broker-build-test.yml
index 5608f32..63082ef 100644
--- a/.github/workflows/broker-build-test.yml
+++ b/.github/workflows/broker-build-test.yml
@@ -62,19 +62,19 @@ jobs:
           echo "No changes detected, skipping further steps"          
 
       - name: List changed files - from now on all tests are run only if there were changes
-        # if: steps.check-changed-files.outputs.files_changed == 'true'
+        if: steps.check-changed-files.outputs.files_changed == 'true'
         run: |
           echo "Changed files: ${{ steps.check-changed-files.outputs.changed_files }}"
           git diff
 
       - name: Set up Terraform latest
-        # if: steps.check-changed-files.outputs.files_changed == 'true'
+        if: steps.check-changed-files.outputs.files_changed == 'true'
         uses: hashicorp/setup-terraform@v2
         with:
           terraform_wrapper: false
 
       - name: Setup Test broker
-        # if: steps.check-changed-files.outputs.files_changed == 'true'
+        if: steps.check-changed-files.outputs.files_changed == 'true'
         run: |
           mkdir -p $HOME/solace; chmod 777 $HOME/solace
           docker run -d -p 8080:8080 -p 55555:55555 --shm-size=1g --env username_admin_globalaccesslevel=admin --env username_admin_password=admin --env system_scaling_maxkafkabridgecount="10" --name=solace \
@@ -82,14 +82,17 @@ jobs:
           while ! curl -s localhost:8080 | grep aurelia ; do sleep 1 ; done
 
       - name: Test module from template on test broker
+        if: steps.check-changed-files.outputs.files_changed == 'true'
         run: |
           ci/scripts/test-module.sh ci/template-test
 
       - name: Test module root on test broker
+        if: steps.check-changed-files.outputs.files_changed == 'true'
         run: |
           ci/scripts/test-module.sh ci/module-test
 
       - name: Test examples
+        if: steps.check-changed-files.outputs.files_changed == 'true'
         run: |
           shopt -s extglob
           for d in examples/!(basic-client-username)/; do (ci/scripts/test-module.sh "$d"); done