diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index 697e178..34c4219 100644
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -63,16 +63,22 @@ jobs:
 
   diagnose_bats:
     name: Diagnose bats
+    needs: test
+    if: always() && needs.test.result == 'failure'
     runs-on: ubuntu-latest
     continue-on-error: true
+    strategy:
+      fail-fast: false
+      matrix:
+        codespell_pip_version: ['codespell']
+        include:
+          - codespell_pip_version: 'git+https://github.com/codespell-project/codespell.git'
     steps:
       - uses: actions/checkout@v1
       - name: Set up Python
         uses: actions/setup-python@v2
-      - run: pip3 --quiet --quiet install git+https://github.com/codespell-project/codespell.git
+      - run: pip3 --quiet --quiet install ${{ matrix.codespell_pip_version }}
       - run: |
-          # Skip the bats diagnostics
-          exit 0
           # Simulate the Dockerfile COPY command
           [ -d "${RUNNER_TEMP}/code/" ] || sudo mkdir -p ${RUNNER_TEMP}/code/
           [ -f "${RUNNER_TEMP}/code/codespell-matcher.json" ] || sudo cp codespell-problem-matcher/codespell-matcher.json ${RUNNER_TEMP}/code/