diff --git a/.github/workflows/pr-test-suite.yml b/.github/workflows/pr-test-suite.yml
index 760638b82..0003a2d19 100644
--- a/.github/workflows/pr-test-suite.yml
+++ b/.github/workflows/pr-test-suite.yml
@@ -12,7 +12,6 @@ on:
 permissions:
   contents: read
 concurrency:
-  # https://stackoverflow.com/questions/74117321/if-condition-in-concurrency-in-gha
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
diff --git a/.github/workflows/tox_steps.yml b/.github/workflows/tox_steps.yml
index f9a3cfb1d..ec9232f5b 100644
--- a/.github/workflows/tox_steps.yml
+++ b/.github/workflows/tox_steps.yml
@@ -58,18 +58,8 @@ jobs:
       run: |-
         python3 tools/pip_install.py tox
       shell: bash
-    - name: Create test farm pem file
-      if: contains(inputs.TOXENV, 'test-farm')
-      env:
-        PEM_CONTENTS: "${{ secrets.AWS_TEST_FARM_PEM }}"
-        AWS_EC2_PEM_FILE: ${{ github.workspace }}/GHAKeyPair.pem
-      run: |-
-        echo "${PEM_CONTENTS}" >> $AWS_EC2_PEM_FILE
-      shell: bash
     - name: Run tox
       env:
-        AWS_ACCESS_KEY_ID: "${{ secrets.AWS_ACCESS_KEY_ID }}"
-        AWS_SECRET_ACCESS_KEY: "${{ secrets.AWS_SECRET_ACCESS_KEY }}"
         PIP_USE_PEP517: "${{ inputs.PIP_USE_PEP517 }}"
         TOXENV: "${{ inputs.TOXENV }}"
       run: |-