diff --git a/.github/workflows/broker-build-test.yml b/.github/workflows/broker-build-test.yml
index 177ad5a..046bfdc 100644
--- a/.github/workflows/broker-build-test.yml
+++ b/.github/workflows/broker-build-test.yml
@@ -20,6 +20,11 @@ jobs:
         with:
           go-version: "1.22"
 
+      - name: Set up Terraform latest
+        uses: hashicorp/setup-terraform@v3
+        with:
+          terraform_wrapper: false
+
       - name: Checkout generator
         uses: actions/checkout@v4
         with:
@@ -61,12 +66,6 @@ jobs:
         run: |
           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'
-        run: |
-          echo "Changed files: ${{ steps.check-changed-files.outputs.changed_files }}"
-          git diff
-
       - name: Setup Test broker
         if: steps.check-changed-files.outputs.files_changed == 'true'
         run: |
@@ -75,11 +74,11 @@ jobs:
             --env system_scaling_maxconnectioncount="1000" --mount type=bind,source=$HOME/solace,destination=/var/lib/solace,ro=false solace/solace-pubsub-standard:latest
           while ! curl -s localhost:8080 | grep aurelia ; do sleep 1 ; done
 
-      - name: Set up Terraform latest
+      - 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'
-        uses: hashicorp/setup-terraform@v2
-        with:
-          terraform_wrapper: false
+        run: |
+          echo "Changed files: ${{ steps.check-changed-files.outputs.changed_files }}"
+          git diff
 
       - name: Test module from template on test broker
         if: steps.check-changed-files.outputs.files_changed == 'true'