diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index cc6ad10f1..39b462e34 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -19,21 +19,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        commandbox_version: [ "5.9.0" ]
+        commandbox_version: [ "6.0.0" ]
         cfengine: [ "lucee@5", "adobe@2018", "adobe@2021", "adobe@2023" ]
         jdkVersion: [ "11" ]
         experimental: [false]
         include:
           - cfengine: "lucee@6"
-            commandbox_version: "6.0.0-alpha"
             jdkVersion: "11"
             experimental: true
           - cfengine: "lucee@6"
-            commandbox_version: "6.0.0-alpha"
             jdkVersion: "17"
             experimental: true
           - cfengine: "adobe@2023"
-            commandbox_version: "5.9.0"
             jdkVersion: "17"
             experimental: false
     steps:
@@ -87,18 +84,11 @@ jobs:
       - name: Set cfengine version env
         run: echo "CFENGINE_VERSION=$(box echo ${serverInfo.engineName@coldbox-${{ matrix.cfengine }}}@${serverInfo.engineVersion@coldbox-${{ matrix.cfengine }}})" >> $GITHUB_ENV
 
-      - name: Publish Test Results
-        uses: EnricoMi/publish-unit-test-result-action@v2
-        if: always()
-        with:
-          files: tests/results/**/*.xml
-          check_name: "${{ env.CFENGINE_VERSION }} Test Results"
-
       - name: Upload Test Results Artifacts
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: coldbox-test-results-${{ matrix.cfengine }}
+          name: Test Results Engine ${{ matrix.cfengine }} JDK ${{ matrix.jdkVersion }}
           path: |
             tests/results/**/*
 
@@ -115,7 +105,7 @@ jobs:
           SLACK_USERNAME: CI
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
 
-      - name: Failure Debugging Info
+      - name: Output Failure Debugging Info
         if: ${{ failure() }}
         run: |
           box version
@@ -126,7 +116,24 @@ jobs:
         if: ${{ failure() }}
         uses: actions/upload-artifact@v4
         with:
-          name: Failure Debugging Info - ${{ matrix.cfengine }}
+          name: Failure Debugging Info - ${{ matrix.cfengine }} - ${{ matrix.jdkVersion }}
           path: |
             .engine/**/logs/*
             .engine/**/WEB-INF/cfusion/logs/*
+
+  # Publish the test results
+  publish-test-results:
+    name: Publish Test Results
+    needs: tests
+    runs-on: ubuntu-latest
+    if: always()
+    steps:
+      - name: Download Test Results Artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: artifacts
+
+      - name: Publish Test Results
+        uses: EnricoMi/publish-unit-test-result-action@v2
+        with:
+          files: artifacts/**/*.xml