diff --git a/.github/actions/run_tox/action.yml b/.github/actions/run_tox/action.yml
index abe82cd7d..0b70fa70f 100644
--- a/.github/actions/run_tox/action.yml
+++ b/.github/actions/run_tox/action.yml
@@ -16,7 +16,7 @@ runs:
   using: composite
   steps:
   - name: Create test farm pem file
-    if: contains(matrix.TOXENV, 'test-farm')
+    if: contains(inputs.TOXENV, 'test-farm')
     env:
       PEM_CONTENTS: "${{ inputs.AWS_TEST_FARM_PEM }}"
     run: |-
diff --git a/.github/actions/setup_tox/action.yml b/.github/actions/setup_tox/action.yml
index 6ff581593..686a53b6d 100644
--- a/.github/actions/setup_tox/action.yml
+++ b/.github/actions/setup_tox/action.yml
@@ -5,6 +5,9 @@ inputs:
     description: 'Contents of keyfile for AWS'
   AWS_EC2_PEM_FILE:
     description: 'Location of keyfile for AWS'
+  PYTHON_VERSION:
+    description: 'Python version to run tests with'
+    required: true
 
 runs:
   using: composite
@@ -31,7 +34,7 @@ runs:
     shell: bash
   - uses: actions/setup-python@v6.2.0
     with:
-      python-version: "${{ matrix.PYTHON_VERSION }}"
+      python-version: "${{ inputs.PYTHON_VERSION }}"
   - name: Install runtime dependencies
     run: |-
       set -e
diff --git a/.github/workflows/extended_tests_jobs.yml b/.github/workflows/extended_tests_jobs.yml
index 7eb350af2..b0c5429de 100644
--- a/.github/workflows/extended_tests_jobs.yml
+++ b/.github/workflows/extended_tests_jobs.yml
@@ -50,6 +50,8 @@ jobs:
       uses: actions/checkout@v6.0.2
     - name: Setup tox
       uses: "./.github/actions/setup_tox"
+      with:
+        PYTHON_VERSION: "${{  matrix.PYTHON_VERSION  }}"
     - name: Run tox
       uses: "./.github/actions/run_tox"
       env:
diff --git a/.github/workflows/standard_tests_jobs.yml b/.github/workflows/standard_tests_jobs.yml
index 1812ec767..239d2a43f 100644
--- a/.github/workflows/standard_tests_jobs.yml
+++ b/.github/workflows/standard_tests_jobs.yml
@@ -46,8 +46,13 @@ jobs:
       uses: actions/checkout@v6.0.2
     - name: Setup tox
       uses: "./.github/actions/setup_tox"
+      with:
+        PYTHON_VERSION: "${{  matrix.PYTHON_VERSION  }}"
     - name: Run tox
       uses: "./.github/actions/run_tox"
+      with:
+        PIP_USE_PEP517: "${{ matrix.PIP_USE_PEP517 }}"
+        TOXENV: "${{ matrix.TOXENV }}"
     - name: Upload coverage
       uses: "./.github/actions/upload_coverage"
   test_sphinx_builds: