diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 4399b0f..680b4bb 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -5,7 +5,8 @@ defaults:
 on:
   pull_request:
 env:
-  TERRAFORM_LOCATIONS: '[".", "./examples/complete/"]' # List of directories to test
+  MODULE_DIRECTORIES: '[".", "./examples/complete/"]' # List of directories to test
+  TERRAFORM_VERSIONS: '["1.5.6", "1.10.1"]' # Current and latest Terraform
 
 jobs:
   # Performs linting and format checks and suggests fixes on PR
@@ -15,8 +16,8 @@ jobs:
     timeout-minutes: 5
     strategy:
       matrix:
-        terraform_version: [1.5.6, 1.10.1]
-        directory: ${{ fromJson(env.TERRAFORM_DIRECTORIES) }}
+        terraform_version: ${{ fromJson(env.TERRAFORM_VERSIONS) }}
+        directory: ${{ fromJson(env.MODULE_DIRECTORIES) }}
       fail-fast: false
     steps:
       - name: Checkout Code
@@ -50,8 +51,8 @@ jobs:
     timeout-minutes: 5
     strategy:
       matrix:
-        terraform_version: [1.5.6, 1.10.1] # Actual and latest versions used
-        directory: ${{ fromJson(env.TERRAFORM_DIRECTORIES) }}
+        terraform_version: ${{ fromJson(env.TERRAFORM_VERSIONS) }}
+        directory: ${{ fromJson(env.MODULE_DIRECTORIES) }}
       fail-fast: false
     steps:
       - name: Checkout Code
@@ -84,6 +85,7 @@ jobs:
     strategy:
       max-parallel: 1
       matrix:
+        terraform_version: ${{ fromJson(env.TERRAFORM_VERSIONS) }}
         os:
           - ubuntu-latest
     runs-on: ${{ matrix.os }}
@@ -98,13 +100,6 @@ jobs:
         with:
           go-version: 1.23.x
 
-      - name: Checkout Code
-        uses: actions/checkout@v2
-      - uses: actions/download-artifact@v3
-        with:
-          name: atun-${{ matrix.os }}-${{ github.sha }}
-          path: bin
-
       - name: Run Tests
         working-directory: test/
         env: