diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 76b0410b3506..5b2441d7ea9a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -142,7 +142,7 @@ jobs:
       go-build-tags: ${{ needs.setup.outputs.go-build-tags }}
       runs-on: ${{ needs.setup.outputs.compute-huge }}
       enterprise: ${{ needs.setup.outputs.enterprise }}
-      name: "-race"
+      name: "race"
     secrets: inherit
   test-go-fips:
     name: Run Go tests with FIPS configuration
@@ -172,7 +172,7 @@ jobs:
       go-build-tags: '${{ needs.setup.outputs.go-build-tags }},deadlock,cgo,fips,fips_140_2'
       runs-on: ${{ needs.setup.outputs.compute-larger }}
       enterprise: ${{ needs.setup.outputs.enterprise }}
-      name: "-fips"
+      name: "fips"
     secrets: inherit
   test-ui:
     name: Test UI
diff --git a/.github/workflows/test-go.yml b/.github/workflows/test-go.yml
index 872c8df163a1..8183db70323b 100644
--- a/.github/workflows/test-go.yml
+++ b/.github/workflows/test-go.yml
@@ -230,7 +230,7 @@ jobs:
             go run gotest.tools/gotestsum --format=short-verbose \
               --junitfile test-results/go-test/results-${{ matrix.runner-index }}.xml \
               --jsonfile test-results/go-test/results-${{ matrix.runner-index }}.json \
-              --jsonfile-timing-events failure-summary-${{ matrix.runner-index }}${{inputs.name}}.json \
+              --jsonfile-timing-events failure-summary-${{ matrix.runner-index }}-${{inputs.name}}.json \
               -- \
               -tags "${{ inputs.go-build-tags }}" \
               -timeout=${{ env.TIMEOUT_IN_MINUTES }}m \
@@ -257,12 +257,18 @@ jobs:
       - name: Archive test results
         uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
         with:
-          name: test-results${{ inputs.name }}
+          name: test-results-${{ inputs.name }}
           path: test-results/
         if: success() || failure()
+      - name: Prepare failure summary
+        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
+        if: success() || failure()
+        run: |
+          jq -r -n 'inputs | select(.Action == "fail") | "| \(.Package) | \(.Test // "-") | \(.Elapsed) |  | [see logs](${{server_url}}/${{github.repository}}/actions/runs/${{github.run_id}}/jobs/${{github.job}}) |"' failure-summary-${{ matrix.runner-index }}-${{inputs.name}}.json
+          jq -r -n 'inputs | select(.Action == "fail") | "| \(.Package) | \(.Test // "-") | ${{inputs.name}} | \(.Elapsed) | ${{ matrix.runner-index }} | [see logs](${{server_url}}/${{github.repository}}/actions/runs/${{github.run_id}}/jobs/${{github.job}}) |"' failure-summary-${{ matrix.runner-index }}-${{inputs.name}}.json
       - name: Upload failure summary
         uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
         if: success() || failure()
         with:
           name: failure-summary
-          path: failure-summary-${{ matrix.runner-index }}${{inputs.name}}.json
+          path: failure-summary-${{ matrix.runner-index }}-${{inputs.name}}.json