diff --git a/.github/workflows/cluster_endtoend_12.yml b/.github/workflows/cluster_endtoend_12.yml
index 21e5f3daf3f..8bd5138a826 100644
--- a/.github/workflows/cluster_endtoend_12.yml
+++ b/.github/workflows/cluster_endtoend_12.yml
@@ -95,9 +95,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -123,8 +120,7 @@ jobs:
 
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard 12 | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard 12
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -132,15 +128,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_13.yml b/.github/workflows/cluster_endtoend_13.yml
index 92d4d39e384..c4ca6125195 100644
--- a/.github/workflows/cluster_endtoend_13.yml
+++ b/.github/workflows/cluster_endtoend_13.yml
@@ -95,9 +95,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -123,8 +120,7 @@ jobs:
 
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard 13 | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard 13
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -132,15 +128,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_15.yml b/.github/workflows/cluster_endtoend_15.yml
index 54ce066fd0f..d541fc292f1 100644
--- a/.github/workflows/cluster_endtoend_15.yml
+++ b/.github/workflows/cluster_endtoend_15.yml
@@ -95,9 +95,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -123,8 +120,7 @@ jobs:
 
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard 15 | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard 15
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -132,15 +128,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_18.yml b/.github/workflows/cluster_endtoend_18.yml
index 126b65346d8..5a5999fdb5b 100644
--- a/.github/workflows/cluster_endtoend_18.yml
+++ b/.github/workflows/cluster_endtoend_18.yml
@@ -95,9 +95,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Installing zookeeper and consul
       if: steps.changes.outputs.end_to_end == 'true'
       run: |
@@ -128,8 +125,7 @@ jobs:
 
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard 18 | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard 18
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -137,15 +133,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_21.yml b/.github/workflows/cluster_endtoend_21.yml
index fb2dcedf338..551b324a67d 100644
--- a/.github/workflows/cluster_endtoend_21.yml
+++ b/.github/workflows/cluster_endtoend_21.yml
@@ -95,9 +95,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Install Minio
       run: |
         wget https://dl.min.io/server/minio/release/linux-amd64/minio
@@ -129,8 +126,7 @@ jobs:
 
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard 21 | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard 21
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -138,15 +134,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_backup_pitr.yml b/.github/workflows/cluster_endtoend_backup_pitr.yml
index a12fbff48b6..8a75221828a 100644
--- a/.github/workflows/cluster_endtoend_backup_pitr.yml
+++ b/.github/workflows/cluster_endtoend_backup_pitr.yml
@@ -95,9 +95,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -123,8 +120,7 @@ jobs:
 
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard backup_pitr | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard backup_pitr
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -132,15 +128,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_backup_pitr_mysqlshell.yml b/.github/workflows/cluster_endtoend_backup_pitr_mysqlshell.yml
index ad7233c6b5d..4cc6e2fc046 100644
--- a/.github/workflows/cluster_endtoend_backup_pitr_mysqlshell.yml
+++ b/.github/workflows/cluster_endtoend_backup_pitr_mysqlshell.yml
@@ -95,9 +95,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -123,8 +120,7 @@ jobs:
 
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard backup_pitr_mysqlshell | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard backup_pitr_mysqlshell
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -132,15 +128,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_backup_pitr_xtrabackup.yml b/.github/workflows/cluster_endtoend_backup_pitr_xtrabackup.yml
index 53c2655568b..81b8d1ddf40 100644
--- a/.github/workflows/cluster_endtoend_backup_pitr_xtrabackup.yml
+++ b/.github/workflows/cluster_endtoend_backup_pitr_xtrabackup.yml
@@ -104,9 +104,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -132,8 +129,7 @@ jobs:
 
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard backup_pitr_xtrabackup | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard backup_pitr_xtrabackup
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -141,15 +137,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_ers_prs_newfeatures_heavy.yml b/.github/workflows/cluster_endtoend_ers_prs_newfeatures_heavy.yml
index 5b92d325424..e635b24d140 100644
--- a/.github/workflows/cluster_endtoend_ers_prs_newfeatures_heavy.yml
+++ b/.github/workflows/cluster_endtoend_ers_prs_newfeatures_heavy.yml
@@ -95,9 +95,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -141,8 +138,7 @@ jobs:
         
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard ers_prs_newfeatures_heavy | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard ers_prs_newfeatures_heavy
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -150,15 +146,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_mysql84.yml b/.github/workflows/cluster_endtoend_mysql84.yml
index e6efcf739f7..257e636023b 100644
--- a/.github/workflows/cluster_endtoend_mysql84.yml
+++ b/.github/workflows/cluster_endtoend_mysql84.yml
@@ -95,9 +95,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -123,8 +120,7 @@ jobs:
 
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard mysql84 | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard mysql84
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -132,15 +128,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_mysql_server_vault.yml b/.github/workflows/cluster_endtoend_mysql_server_vault.yml
index 140c7b0e506..9ea4c6423f8 100644
--- a/.github/workflows/cluster_endtoend_mysql_server_vault.yml
+++ b/.github/workflows/cluster_endtoend_mysql_server_vault.yml
@@ -95,9 +95,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Installing zookeeper and consul
       if: steps.changes.outputs.end_to_end == 'true'
       run: |
@@ -128,8 +125,7 @@ jobs:
 
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard mysql_server_vault | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard mysql_server_vault
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -137,15 +133,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_onlineddl_revert.yml b/.github/workflows/cluster_endtoend_onlineddl_revert.yml
index 4405f989640..8fe286ed1f1 100644
--- a/.github/workflows/cluster_endtoend_onlineddl_revert.yml
+++ b/.github/workflows/cluster_endtoend_onlineddl_revert.yml
@@ -96,9 +96,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -124,8 +121,7 @@ jobs:
 
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard onlineddl_revert | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard onlineddl_revert
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -133,15 +129,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_onlineddl_scheduler.yml b/.github/workflows/cluster_endtoend_onlineddl_scheduler.yml
index 11f7e31be57..1872fd3f13c 100644
--- a/.github/workflows/cluster_endtoend_onlineddl_scheduler.yml
+++ b/.github/workflows/cluster_endtoend_onlineddl_scheduler.yml
@@ -96,9 +96,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -124,8 +121,7 @@ jobs:
 
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard onlineddl_scheduler | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard onlineddl_scheduler
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -133,15 +129,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_onlineddl_vrepl.yml b/.github/workflows/cluster_endtoend_onlineddl_vrepl.yml
index 3b7daba2db7..80d2f77c003 100644
--- a/.github/workflows/cluster_endtoend_onlineddl_vrepl.yml
+++ b/.github/workflows/cluster_endtoend_onlineddl_vrepl.yml
@@ -96,9 +96,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -132,8 +129,7 @@ jobs:
         
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard onlineddl_vrepl | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard onlineddl_vrepl
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -141,15 +137,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress.yml b/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress.yml
index 0ad0f5c35c9..3083594b39f 100644
--- a/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress.yml
+++ b/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress.yml
@@ -96,9 +96,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -132,8 +129,7 @@ jobs:
         
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard onlineddl_vrepl_stress | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard onlineddl_vrepl_stress
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -141,15 +137,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress_suite.yml b/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress_suite.yml
index 9a266e1ee31..cb23b8dfcc0 100644
--- a/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress_suite.yml
+++ b/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress_suite.yml
@@ -96,9 +96,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -132,8 +129,7 @@ jobs:
         
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard onlineddl_vrepl_stress_suite | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard onlineddl_vrepl_stress_suite
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -141,15 +137,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_onlineddl_vrepl_suite.yml b/.github/workflows/cluster_endtoend_onlineddl_vrepl_suite.yml
index 35e879254a2..5d7819864d1 100644
--- a/.github/workflows/cluster_endtoend_onlineddl_vrepl_suite.yml
+++ b/.github/workflows/cluster_endtoend_onlineddl_vrepl_suite.yml
@@ -96,9 +96,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -132,8 +129,7 @@ jobs:
         
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard onlineddl_vrepl_suite | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard onlineddl_vrepl_suite
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -141,15 +137,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_schemadiff_vrepl.yml b/.github/workflows/cluster_endtoend_schemadiff_vrepl.yml
index 54aa074b31f..76b3807cf42 100644
--- a/.github/workflows/cluster_endtoend_schemadiff_vrepl.yml
+++ b/.github/workflows/cluster_endtoend_schemadiff_vrepl.yml
@@ -96,9 +96,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -132,8 +129,7 @@ jobs:
         
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard schemadiff_vrepl | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard schemadiff_vrepl
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -141,15 +137,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_tabletmanager_consul.yml b/.github/workflows/cluster_endtoend_tabletmanager_consul.yml
index 985b4b0426b..30260a55621 100644
--- a/.github/workflows/cluster_endtoend_tabletmanager_consul.yml
+++ b/.github/workflows/cluster_endtoend_tabletmanager_consul.yml
@@ -95,9 +95,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Installing zookeeper and consul
       if: steps.changes.outputs.end_to_end == 'true'
       run: |
@@ -128,8 +125,7 @@ jobs:
 
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard tabletmanager_consul | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard tabletmanager_consul
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -137,15 +133,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_tabletmanager_tablegc.yml b/.github/workflows/cluster_endtoend_tabletmanager_tablegc.yml
index 0a98589fddf..357bd407319 100644
--- a/.github/workflows/cluster_endtoend_tabletmanager_tablegc.yml
+++ b/.github/workflows/cluster_endtoend_tabletmanager_tablegc.yml
@@ -95,9 +95,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -123,8 +120,7 @@ jobs:
 
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard tabletmanager_tablegc | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard tabletmanager_tablegc
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -132,15 +128,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_tabletmanager_throttler_topo.yml b/.github/workflows/cluster_endtoend_tabletmanager_throttler_topo.yml
index c83463219d2..43c6c140bc8 100644
--- a/.github/workflows/cluster_endtoend_tabletmanager_throttler_topo.yml
+++ b/.github/workflows/cluster_endtoend_tabletmanager_throttler_topo.yml
@@ -95,9 +95,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -123,8 +120,7 @@ jobs:
 
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard tabletmanager_throttler_topo | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard tabletmanager_throttler_topo
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -132,15 +128,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_topo_connection_cache.yml b/.github/workflows/cluster_endtoend_topo_connection_cache.yml
index 972b1656ffa..194eaf26459 100644
--- a/.github/workflows/cluster_endtoend_topo_connection_cache.yml
+++ b/.github/workflows/cluster_endtoend_topo_connection_cache.yml
@@ -95,9 +95,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -123,8 +120,7 @@ jobs:
 
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard topo_connection_cache | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard topo_connection_cache
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -132,15 +128,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_vreplication_across_db_versions.yml b/.github/workflows/cluster_endtoend_vreplication_across_db_versions.yml
index 2cf964b8b55..06a18b74077 100644
--- a/.github/workflows/cluster_endtoend_vreplication_across_db_versions.yml
+++ b/.github/workflows/cluster_endtoend_vreplication_across_db_versions.yml
@@ -95,9 +95,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -149,8 +146,7 @@ jobs:
         
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard vreplication_across_db_versions | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard vreplication_across_db_versions
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -158,15 +154,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_vreplication_basic.yml b/.github/workflows/cluster_endtoend_vreplication_basic.yml
index c7b9a534dd2..afd1d556618 100644
--- a/.github/workflows/cluster_endtoend_vreplication_basic.yml
+++ b/.github/workflows/cluster_endtoend_vreplication_basic.yml
@@ -95,9 +95,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -149,8 +146,7 @@ jobs:
         
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard vreplication_basic | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard vreplication_basic
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -158,15 +154,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_vreplication_cellalias.yml b/.github/workflows/cluster_endtoend_vreplication_cellalias.yml
index 8eba516bcd1..4b0e0072f66 100644
--- a/.github/workflows/cluster_endtoend_vreplication_cellalias.yml
+++ b/.github/workflows/cluster_endtoend_vreplication_cellalias.yml
@@ -95,9 +95,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -149,8 +146,7 @@ jobs:
         
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard vreplication_cellalias | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard vreplication_cellalias
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -158,15 +154,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_vreplication_copy_parallel.yml b/.github/workflows/cluster_endtoend_vreplication_copy_parallel.yml
index f140d2ec70a..fa576cdf5af 100644
--- a/.github/workflows/cluster_endtoend_vreplication_copy_parallel.yml
+++ b/.github/workflows/cluster_endtoend_vreplication_copy_parallel.yml
@@ -95,9 +95,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -149,8 +146,7 @@ jobs:
         
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard vreplication_copy_parallel | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard vreplication_copy_parallel
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -158,15 +154,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_vreplication_foreign_key_stress.yml b/.github/workflows/cluster_endtoend_vreplication_foreign_key_stress.yml
index 3f78447e4ec..d51647547b7 100644
--- a/.github/workflows/cluster_endtoend_vreplication_foreign_key_stress.yml
+++ b/.github/workflows/cluster_endtoend_vreplication_foreign_key_stress.yml
@@ -95,9 +95,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -149,8 +146,7 @@ jobs:
         
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard vreplication_foreign_key_stress | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard vreplication_foreign_key_stress
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -158,15 +154,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_vreplication_mariadb_to_mysql.yml b/.github/workflows/cluster_endtoend_vreplication_mariadb_to_mysql.yml
index eef2e2688f1..a50856bda94 100644
--- a/.github/workflows/cluster_endtoend_vreplication_mariadb_to_mysql.yml
+++ b/.github/workflows/cluster_endtoend_vreplication_mariadb_to_mysql.yml
@@ -95,9 +95,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -149,8 +146,7 @@ jobs:
         
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard vreplication_mariadb_to_mysql | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard vreplication_mariadb_to_mysql
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -158,15 +154,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_vreplication_migrate.yml b/.github/workflows/cluster_endtoend_vreplication_migrate.yml
index bbf0c99a7fd..cb2bdea4b80 100644
--- a/.github/workflows/cluster_endtoend_vreplication_migrate.yml
+++ b/.github/workflows/cluster_endtoend_vreplication_migrate.yml
@@ -95,9 +95,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -149,8 +146,7 @@ jobs:
         
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard vreplication_migrate | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard vreplication_migrate
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -158,15 +154,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_vreplication_multi_tenant.yml b/.github/workflows/cluster_endtoend_vreplication_multi_tenant.yml
index dea317e3e6e..372de48f2f0 100644
--- a/.github/workflows/cluster_endtoend_vreplication_multi_tenant.yml
+++ b/.github/workflows/cluster_endtoend_vreplication_multi_tenant.yml
@@ -95,9 +95,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -149,8 +146,7 @@ jobs:
         
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard vreplication_multi_tenant | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard vreplication_multi_tenant
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -158,15 +154,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_vreplication_partial_movetables_and_materialize.yml b/.github/workflows/cluster_endtoend_vreplication_partial_movetables_and_materialize.yml
index 5f9fecc4e64..c2cbd5f8d8e 100644
--- a/.github/workflows/cluster_endtoend_vreplication_partial_movetables_and_materialize.yml
+++ b/.github/workflows/cluster_endtoend_vreplication_partial_movetables_and_materialize.yml
@@ -95,9 +95,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -149,8 +146,7 @@ jobs:
         
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard vreplication_partial_movetables_and_materialize | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard vreplication_partial_movetables_and_materialize
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -158,15 +154,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_vreplication_v2.yml b/.github/workflows/cluster_endtoend_vreplication_v2.yml
index 98e2a51b4bd..1308d9a6347 100644
--- a/.github/workflows/cluster_endtoend_vreplication_v2.yml
+++ b/.github/workflows/cluster_endtoend_vreplication_v2.yml
@@ -95,9 +95,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -149,8 +146,7 @@ jobs:
         
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard vreplication_v2 | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard vreplication_v2
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -158,15 +154,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_vreplication_vdiff2.yml b/.github/workflows/cluster_endtoend_vreplication_vdiff2.yml
index f79584ca1cd..6bc4333a9f9 100644
--- a/.github/workflows/cluster_endtoend_vreplication_vdiff2.yml
+++ b/.github/workflows/cluster_endtoend_vreplication_vdiff2.yml
@@ -95,9 +95,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -149,8 +146,7 @@ jobs:
         
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard vreplication_vdiff2 | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard vreplication_vdiff2
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -158,15 +154,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_vreplication_vtctldclient_movetables_tz.yml b/.github/workflows/cluster_endtoend_vreplication_vtctldclient_movetables_tz.yml
index bc549979f4c..a4026e22460 100644
--- a/.github/workflows/cluster_endtoend_vreplication_vtctldclient_movetables_tz.yml
+++ b/.github/workflows/cluster_endtoend_vreplication_vtctldclient_movetables_tz.yml
@@ -95,9 +95,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -149,8 +146,7 @@ jobs:
         
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard vreplication_vtctldclient_movetables_tz | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard vreplication_vtctldclient_movetables_tz
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -158,15 +154,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_vstream.yml b/.github/workflows/cluster_endtoend_vstream.yml
index b2fe9b30515..79a9f0aba55 100644
--- a/.github/workflows/cluster_endtoend_vstream.yml
+++ b/.github/workflows/cluster_endtoend_vstream.yml
@@ -95,9 +95,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -123,8 +120,7 @@ jobs:
 
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard vstream | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard vstream
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -132,15 +128,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_vtbackup.yml b/.github/workflows/cluster_endtoend_vtbackup.yml
index f9ae73f0845..5b3c8d4a9d5 100644
--- a/.github/workflows/cluster_endtoend_vtbackup.yml
+++ b/.github/workflows/cluster_endtoend_vtbackup.yml
@@ -95,9 +95,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -123,8 +120,7 @@ jobs:
 
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard vtbackup | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard vtbackup
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -132,15 +128,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_vtctlbackup_sharded_clustertest_heavy.yml b/.github/workflows/cluster_endtoend_vtctlbackup_sharded_clustertest_heavy.yml
index 9e2f36d3a24..32838d962b7 100644
--- a/.github/workflows/cluster_endtoend_vtctlbackup_sharded_clustertest_heavy.yml
+++ b/.github/workflows/cluster_endtoend_vtctlbackup_sharded_clustertest_heavy.yml
@@ -95,9 +95,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -141,8 +138,7 @@ jobs:
         
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard vtctlbackup_sharded_clustertest_heavy | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard vtctlbackup_sharded_clustertest_heavy
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -150,15 +146,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_vtgate_concurrentdml.yml b/.github/workflows/cluster_endtoend_vtgate_concurrentdml.yml
index 305744a02ec..fbcdff09508 100644
--- a/.github/workflows/cluster_endtoend_vtgate_concurrentdml.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_concurrentdml.yml
@@ -95,9 +95,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -123,8 +120,7 @@ jobs:
 
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard vtgate_concurrentdml | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard vtgate_concurrentdml
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -132,15 +128,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_vtgate_foreignkey_stress.yml b/.github/workflows/cluster_endtoend_vtgate_foreignkey_stress.yml
index 3d57a1f08fd..8c3e27356c3 100644
--- a/.github/workflows/cluster_endtoend_vtgate_foreignkey_stress.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_foreignkey_stress.yml
@@ -95,9 +95,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -123,8 +120,7 @@ jobs:
 
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard vtgate_foreignkey_stress | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard vtgate_foreignkey_stress
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -132,15 +128,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_vtgate_gen4.yml b/.github/workflows/cluster_endtoend_vtgate_gen4.yml
index 3329dde0eda..aabb13cc8a9 100644
--- a/.github/workflows/cluster_endtoend_vtgate_gen4.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_gen4.yml
@@ -95,9 +95,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -123,8 +120,7 @@ jobs:
 
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard vtgate_gen4 | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard vtgate_gen4
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -132,15 +128,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_vtgate_general_heavy.yml b/.github/workflows/cluster_endtoend_vtgate_general_heavy.yml
index a65f484527d..a7711db0cc5 100644
--- a/.github/workflows/cluster_endtoend_vtgate_general_heavy.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_general_heavy.yml
@@ -95,9 +95,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -141,8 +138,7 @@ jobs:
         
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard vtgate_general_heavy | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard vtgate_general_heavy
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -150,15 +146,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_vtgate_godriver.yml b/.github/workflows/cluster_endtoend_vtgate_godriver.yml
index 30f96b98abf..642e124dc31 100644
--- a/.github/workflows/cluster_endtoend_vtgate_godriver.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_godriver.yml
@@ -95,9 +95,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -123,8 +120,7 @@ jobs:
 
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard vtgate_godriver | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard vtgate_godriver
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -132,15 +128,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_vtgate_partial_keyspace.yml b/.github/workflows/cluster_endtoend_vtgate_partial_keyspace.yml
index bce3096d51b..4bbfc030672 100644
--- a/.github/workflows/cluster_endtoend_vtgate_partial_keyspace.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_partial_keyspace.yml
@@ -95,9 +95,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -123,8 +120,7 @@ jobs:
 
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard vtgate_partial_keyspace -partial-keyspace=true  | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard vtgate_partial_keyspace -partial-keyspace=true 
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -132,15 +128,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_vtgate_plantests.yml b/.github/workflows/cluster_endtoend_vtgate_plantests.yml
index 40f3b4d3297..05772ee16ea 100644
--- a/.github/workflows/cluster_endtoend_vtgate_plantests.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_plantests.yml
@@ -95,9 +95,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -123,8 +120,7 @@ jobs:
 
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard vtgate_plantests | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard vtgate_plantests
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -132,15 +128,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_vtgate_queries.yml b/.github/workflows/cluster_endtoend_vtgate_queries.yml
index b9212aed370..c4ed35e43c3 100644
--- a/.github/workflows/cluster_endtoend_vtgate_queries.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_queries.yml
@@ -95,9 +95,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -123,8 +120,7 @@ jobs:
 
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard vtgate_queries | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard vtgate_queries
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -132,15 +128,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_vtgate_readafterwrite.yml b/.github/workflows/cluster_endtoend_vtgate_readafterwrite.yml
index 93f2b9f82c5..6f0b2aed0eb 100644
--- a/.github/workflows/cluster_endtoend_vtgate_readafterwrite.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_readafterwrite.yml
@@ -95,9 +95,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -123,8 +120,7 @@ jobs:
 
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard vtgate_readafterwrite | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard vtgate_readafterwrite
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -132,15 +128,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_vtgate_reservedconn.yml b/.github/workflows/cluster_endtoend_vtgate_reservedconn.yml
index 307533195dd..346e32729a4 100644
--- a/.github/workflows/cluster_endtoend_vtgate_reservedconn.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_reservedconn.yml
@@ -95,9 +95,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -123,8 +120,7 @@ jobs:
 
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard vtgate_reservedconn | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard vtgate_reservedconn
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -132,15 +128,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_vtgate_schema.yml b/.github/workflows/cluster_endtoend_vtgate_schema.yml
index 1f1121951cf..16191c2b403 100644
--- a/.github/workflows/cluster_endtoend_vtgate_schema.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_schema.yml
@@ -95,9 +95,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -123,8 +120,7 @@ jobs:
 
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard vtgate_schema | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard vtgate_schema
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -132,15 +128,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_vtgate_schema_tracker.yml b/.github/workflows/cluster_endtoend_vtgate_schema_tracker.yml
index 083e555159e..f95ffd56697 100644
--- a/.github/workflows/cluster_endtoend_vtgate_schema_tracker.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_schema_tracker.yml
@@ -95,9 +95,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -123,8 +120,7 @@ jobs:
 
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard vtgate_schema_tracker | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard vtgate_schema_tracker
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -132,15 +128,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_vtgate_tablet_healthcheck_cache.yml b/.github/workflows/cluster_endtoend_vtgate_tablet_healthcheck_cache.yml
index 01a40941cba..91861308234 100644
--- a/.github/workflows/cluster_endtoend_vtgate_tablet_healthcheck_cache.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_tablet_healthcheck_cache.yml
@@ -95,9 +95,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -123,8 +120,7 @@ jobs:
 
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard vtgate_tablet_healthcheck_cache | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard vtgate_tablet_healthcheck_cache
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -132,15 +128,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_vtgate_topo.yml b/.github/workflows/cluster_endtoend_vtgate_topo.yml
index 8ed6221ab2e..bee3a6bf44f 100644
--- a/.github/workflows/cluster_endtoend_vtgate_topo.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_topo.yml
@@ -95,9 +95,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -123,8 +120,7 @@ jobs:
 
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard vtgate_topo | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard vtgate_topo
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -132,15 +128,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_vtgate_topo_consul.yml b/.github/workflows/cluster_endtoend_vtgate_topo_consul.yml
index 09928da3ae0..fe289b3eceb 100644
--- a/.github/workflows/cluster_endtoend_vtgate_topo_consul.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_topo_consul.yml
@@ -95,9 +95,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Installing zookeeper and consul
       if: steps.changes.outputs.end_to_end == 'true'
       run: |
@@ -128,8 +125,7 @@ jobs:
 
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard vtgate_topo_consul | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard vtgate_topo_consul
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -137,15 +133,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_vtgate_topo_etcd.yml b/.github/workflows/cluster_endtoend_vtgate_topo_etcd.yml
index 6de86d2f30c..da190ab3a4e 100644
--- a/.github/workflows/cluster_endtoend_vtgate_topo_etcd.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_topo_etcd.yml
@@ -95,9 +95,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -123,8 +120,7 @@ jobs:
 
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard vtgate_topo_etcd | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard vtgate_topo_etcd
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -132,15 +128,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_vtgate_transaction.yml b/.github/workflows/cluster_endtoend_vtgate_transaction.yml
index cfabc51b7f7..36a69841044 100644
--- a/.github/workflows/cluster_endtoend_vtgate_transaction.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_transaction.yml
@@ -95,9 +95,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -123,8 +120,7 @@ jobs:
 
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard vtgate_transaction -build-tag=debug2PC  | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard vtgate_transaction -build-tag=debug2PC 
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -132,15 +128,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_vtgate_unsharded.yml b/.github/workflows/cluster_endtoend_vtgate_unsharded.yml
index b4185cf74cd..66055581678 100644
--- a/.github/workflows/cluster_endtoend_vtgate_unsharded.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_unsharded.yml
@@ -95,9 +95,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -123,8 +120,7 @@ jobs:
 
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard vtgate_unsharded | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard vtgate_unsharded
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -132,15 +128,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_vtgate_vindex_heavy.yml b/.github/workflows/cluster_endtoend_vtgate_vindex_heavy.yml
index 123dccbc137..95c13540344 100644
--- a/.github/workflows/cluster_endtoend_vtgate_vindex_heavy.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_vindex_heavy.yml
@@ -95,9 +95,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -141,8 +138,7 @@ jobs:
         
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard vtgate_vindex_heavy | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard vtgate_vindex_heavy
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -150,15 +146,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_vtgate_vschema.yml b/.github/workflows/cluster_endtoend_vtgate_vschema.yml
index a3b3a66ca46..c83674bc04f 100644
--- a/.github/workflows/cluster_endtoend_vtgate_vschema.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_vschema.yml
@@ -95,9 +95,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -123,8 +120,7 @@ jobs:
 
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard vtgate_vschema | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard vtgate_vschema
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -132,15 +128,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_vtorc.yml b/.github/workflows/cluster_endtoend_vtorc.yml
index 8975c01b45f..3991593e73e 100644
--- a/.github/workflows/cluster_endtoend_vtorc.yml
+++ b/.github/workflows/cluster_endtoend_vtorc.yml
@@ -104,9 +104,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -132,8 +129,7 @@ jobs:
 
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard vtorc | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard vtorc
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -141,15 +137,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_vttablet_prscomplex.yml b/.github/workflows/cluster_endtoend_vttablet_prscomplex.yml
index 784d90f5150..8139cf0c940 100644
--- a/.github/workflows/cluster_endtoend_vttablet_prscomplex.yml
+++ b/.github/workflows/cluster_endtoend_vttablet_prscomplex.yml
@@ -95,9 +95,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -123,8 +120,7 @@ jobs:
 
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard vttablet_prscomplex | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard vttablet_prscomplex
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -132,15 +128,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_xb_backup.yml b/.github/workflows/cluster_endtoend_xb_backup.yml
index bd62836a14b..f7ec7690210 100644
--- a/.github/workflows/cluster_endtoend_xb_backup.yml
+++ b/.github/workflows/cluster_endtoend_xb_backup.yml
@@ -104,9 +104,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -132,8 +129,7 @@ jobs:
 
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard xb_backup | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard xb_backup
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -141,15 +137,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/cluster_endtoend_xb_recovery.yml b/.github/workflows/cluster_endtoend_xb_recovery.yml
index f9039793633..5a4ff1fea83 100644
--- a/.github/workflows/cluster_endtoend_xb_recovery.yml
+++ b/.github/workflows/cluster_endtoend_xb_recovery.yml
@@ -104,9 +104,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
-
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'
       run: |
@@ -132,8 +129,7 @@ jobs:
 
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker=false -follow -shard xb_recovery | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker=false -follow -shard xb_recovery
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -141,15 +137,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/.github/workflows/local_example.yml b/.github/workflows/local_example.yml
index 5f5576a771c..447e0932963 100644
--- a/.github/workflows/local_example.yml
+++ b/.github/workflows/local_example.yml
@@ -84,4 +84,4 @@ jobs:
         if [ "${{matrix.os}}" = "macos-latest" ]; then
           export PATH="/usr/local/opt/mysql@5.7/bin:$PATH"
         fi
-        go run test.go -print-log -follow -retry=1 local_example
+        go run test.go -print-log -follow local_example
diff --git a/.github/workflows/region_example.yml b/.github/workflows/region_example.yml
index aea5f4b6583..5eca754db48 100644
--- a/.github/workflows/region_example.yml
+++ b/.github/workflows/region_example.yml
@@ -84,4 +84,4 @@ jobs:
         if [ "${{matrix.os}}" = "macos-latest" ]; then
           export PATH="/usr/local/opt/mysql@5.7/bin:$PATH"
         fi
-        go run test.go -print-log -follow -retry=1 region_example
+        go run test.go -print-log -follow region_example
diff --git a/.github/workflows/vtop_example.yml b/.github/workflows/vtop_example.yml
index feb347a886f..84ac24daa23 100644
--- a/.github/workflows/vtop_example.yml
+++ b/.github/workflows/vtop_example.yml
@@ -4,9 +4,9 @@ on:
     branches:
       - "main"
       - "release-[0-9]+.[0-9]"
-    tags: '**'
+    tags: "**"
   pull_request:
-    branches: '**'
+    branches: "**"
 concurrency:
   group: format('{0}-{1}', ${{ github.ref }}, 'vtop_example')
   cancel-in-progress: true
@@ -27,13 +27,13 @@ jobs:
       - name: Check out code
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
-          persist-credentials: 'false'
+          persist-credentials: "false"
 
       - name: Check for changes in relevant files
         uses: dorny/paths-filter@ebc4d7e9ebcb0b1eb21480bb8f43113e996ac77a # v3.0.1
         id: changes
         with:
-          token: ''
+          token: ""
           filters: |
             end_to_end:
               - 'go/**/*.go'
@@ -89,4 +89,4 @@ jobs:
         timeout-minutes: 60
         run: |
           source build.env
-          go run test.go -docker=false -skip-build -print-log -follow -retry=1 -timeout=60m vtop_example
+          go run test.go -docker=false -skip-build -print-log -follow -timeout=60m vtop_example
diff --git a/docker/test/run.sh b/docker/test/run.sh
index 907418b16ff..f41e2b49c89 100755
--- a/docker/test/run.sh
+++ b/docker/test/run.sh
@@ -145,6 +145,12 @@ args="$args -v $PWD/test/bin:/tmp/bin"
 if [[ -n "$TOPO" ]]; then
   args="$args -e TOPO=$TOPO"
 fi
+
+# Pass through PACKAGES environment variable if it's set
+if [[ -n "$PACKAGES" ]]; then
+  args="$args -e PACKAGES=$PACKAGES"
+fi
+
 # Mount in host VTDATAROOT if one exists, since it might be a RAM disk or SSD.
 if [[ -n "$VTDATAROOT" ]]; then
   hostdir=`mktemp -d $VTDATAROOT/test-XXX`
diff --git a/go.mod b/go.mod
index 1d529b29816..fda15316109 100644
--- a/go.mod
+++ b/go.mod
@@ -2,6 +2,8 @@ module vitess.io/vitess
 
 go 1.25.6
 
+tool gotest.tools/gotestsum
+
 require (
 	cloud.google.com/go/storage v1.57.0
 	github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6
@@ -126,11 +128,13 @@ require (
 	github.com/DataDog/go-runtime-metrics-internal v0.0.4-0.20250721125240-fdf1ef85b633 // indirect
 	github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.29.1 // indirect
 	github.com/Masterminds/semver/v3 v3.4.0 // indirect
+	github.com/bitfield/gotestdox v0.2.2 // indirect
 	github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect
 	github.com/cilium/ebpf v0.19.0 // indirect
 	github.com/clipperhouse/uax29/v2 v2.2.0 // indirect
 	github.com/containerd/log v0.1.0 // indirect
 	github.com/containerd/stargz-snapshotter/estargz v0.18.0 // indirect
+	github.com/dnephin/pflag v1.0.7 // indirect
 	github.com/docker/cli v29.0.3+incompatible // indirect
 	github.com/docker/distribution v2.8.3+incompatible // indirect
 	github.com/docker/docker-credential-helpers v0.9.3 // indirect
@@ -158,6 +162,7 @@ require (
 	go.opentelemetry.io/otel/log v0.14.0 // indirect
 	go.yaml.in/yaml/v2 v2.4.3 // indirect
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
+	gotest.tools/gotestsum v1.13.0 // indirect
 	k8s.io/apimachinery v0.33.4 // indirect
 )
 
diff --git a/go.sum b/go.sum
index ebd5471a8a5..fe7b4383328 100644
--- a/go.sum
+++ b/go.sum
@@ -149,6 +149,8 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
+github.com/bitfield/gotestdox v0.2.2 h1:x6RcPAbBbErKLnapz1QeAlf3ospg8efBsedU93CDsnE=
+github.com/bitfield/gotestdox v0.2.2/go.mod h1:D+gwtS0urjBrzguAkTM2wodsTQYFHdpx8eqRJ3N+9pY=
 github.com/bndr/gotabulate v1.1.2 h1:yC9izuZEphojb9r+KYL4W9IJKO/ceIO8HDwxMA24U4c=
 github.com/bndr/gotabulate v1.1.2/go.mod h1:0+8yUgaPTtLRTjf49E8oju7ojpU11YmXyvq1LbPAb3U=
 github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs=
@@ -197,6 +199,8 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8Yc
 github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
 github.com/dgryski/go-farm v0.0.0-20240924180020-3414d57e47da h1:aIftn67I1fkbMa512G+w+Pxci9hJPB8oMnkcP3iZF38=
 github.com/dgryski/go-farm v0.0.0-20240924180020-3414d57e47da/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
+github.com/dnephin/pflag v1.0.7 h1:oxONGlWxhmUct0YzKTgrpQv9AUA1wtPBn7zuSjJqptk=
+github.com/dnephin/pflag v1.0.7/go.mod h1:uxE91IoWURlOiTUIA8Mq5ZZkAv3dPUfZNaT80Zm7OQE=
 github.com/docker/cli v29.0.3+incompatible h1:8J+PZIcF2xLd6h5sHPsp5pvvJA+Sr2wGQxHkRl53a1E=
 github.com/docker/cli v29.0.3+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
 github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
@@ -932,6 +936,8 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gotest.tools/gotestsum v1.13.0 h1:+Lh454O9mu9AMG1APV4o0y7oDYKyik/3kBOiCqiEpRo=
+gotest.tools/gotestsum v1.13.0/go.mod h1:7f0NS5hFb0dWr4NtcsAsF0y1kzjEFfAil0HiBQJE03Q=
 gotest.tools/v3 v3.5.2 h1:7koQfIKdy+I8UTetycgUqXWSDwpgv193Ka+qRsmBY8Q=
 gotest.tools/v3 v3.5.2/go.mod h1:LtdLGcnqToBH83WByAAi/wiwSFCArdFIUV/xxN4pcjA=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
diff --git a/test.go b/test.go
index e243b94019e..93095dcab05 100755
--- a/test.go
+++ b/test.go
@@ -81,7 +81,6 @@ var (
 	flavor           = flag.String("flavor", "mysql80", "comma-separated bootstrap flavor(s) to run against (when using Docker mode). Available flavors: all,"+flavors)
 	bootstrapVersion = flag.String("bootstrap-version", "48.0", "the version identifier to use for the docker images")
 	runCount         = flag.Int("runs", 1, "run each test this many times")
-	retryMax         = flag.Int("retry", 3, "max number of retries, to detect flaky tests")
 	logPass          = flag.Bool("log-pass", false, "log test output even if it passes")
 	timeout          = flag.Duration("timeout", 30*time.Minute, "timeout for each test")
 	pull             = flag.Bool("pull", true, "re-pull the bootstrap image, in case it's been updated")
@@ -124,8 +123,10 @@ type Config struct {
 
 // Test is an entry from the test/config.json file.
 type Test struct {
-	File          string
-	Args, Command []string
+	File     string
+	Args     []string
+	Command  []string
+	Packages []string
 
 	// Manual means it won't be run unless explicitly specified.
 	Manual bool
@@ -133,10 +134,6 @@ type Test struct {
 	// Shard is used to split tests among workers.
 	Shard string
 
-	// RetryMax is the maximum number of times a test will be retried.
-	// If 0, flag *retryMax is used.
-	RetryMax int
-
 	// Tags is a list of tags that can be used to filter tests.
 	Tags []string
 
@@ -176,6 +173,12 @@ func (t *Test) run(dir, dataDir string) ([]byte, error) {
 		t.pass++
 		return nil, nil
 	}
+
+	junitOutput := fmt.Sprintf("_test/junit/report-%s-%d.xml", t.name, t.runIndex+1)
+	if *docker {
+		junitOutput = path.Join("/tmp/src", junitOutput)
+	}
+
 	testCmd := t.Command
 	if len(testCmd) == 0 {
 		if strings.Contains(fmt.Sprintf("%v", t.File), ".go") {
@@ -219,10 +222,15 @@ func (t *Test) run(dir, dataDir string) ([]byte, error) {
 	// Also try to make them use different port ranges
 	// to mitigate failures due to zombie processes.
 	cmd.Env = updateEnv(os.Environ(), map[string]string{
-		"VTROOT":      "/vt/src/vitess.io/vitess",
-		"VTDATAROOT":  dataDir,
-		"VTPORTSTART": strconv.FormatInt(int64(getPortStart(100)), 10),
-		"TOPO":        os.Getenv("TOPO"),
+		// Disable gRPC server GOAWAY/"too_many_pings" errors. Context:
+		// https://github.com/grpc/grpc/blob/master/doc/keepalive.md
+		"GRPC_ARG_HTTP2_MAX_PINGS_WITHOUT_DATA": "0",
+		"JUNIT_OUTPUT":                          junitOutput,
+		"PACKAGES":                              strings.Join(t.Packages, " "),
+		"VTROOT":                                "/vt/src/vitess.io/vitess",
+		"VTDATAROOT":                            dataDir,
+		"VTPORTSTART":                           strconv.FormatInt(int64(getPortStart(100)), 10),
+		"TOPO":                                  os.Getenv("TOPO"),
 	})
 
 	// Capture test output.
@@ -335,7 +343,13 @@ func main() {
 	if err := os.MkdirAll(outDir, os.FileMode(0755)); err != nil {
 		log.Fatalf("Can't create output directory: %v", err)
 	}
-	logFile, err := os.OpenFile(path.Join(outDir, "test.log"), os.O_RDWR|os.O_CREATE, 0644)
+
+	junitDir := path.Join("_test", "junit")
+	if err := os.MkdirAll(junitDir, os.FileMode(0755)); err != nil {
+		log.Fatalf("Can't create junit directory: %v", err)
+	}
+
+	logFile, err := os.OpenFile(path.Join(outDir, "test.log"), os.O_RDWR|os.O_CREATE, 0o0644)
 	if err != nil {
 		log.Fatalf("Can't create log file: %v", err)
 	}
@@ -488,89 +502,63 @@ func main() {
 			defer wg.Done()
 
 			for test := range next {
-				tryMax := *retryMax
-				if test.RetryMax != 0 {
-					tryMax = test.RetryMax
+				select {
+				case <-stop:
+					test.logf("cancelled")
+					return
+				default:
 				}
-				for try := 1; ; try++ {
-					select {
-					case <-stop:
-						test.logf("cancelled")
-						return
-					default:
-					}
 
-					if try > tryMax {
-						// Every try failed.
-						test.logf("retry limit exceeded")
-						mu.Lock()
-						failed++
-						mu.Unlock()
-						break
-					}
+				test.logf("running...")
 
-					test.logf("running (try %v/%v)...", try, tryMax)
+				// Make a unique VTDATAROOT.
+				dataDir, err := os.MkdirTemp(vtDataRoot, "vt_")
+				if err != nil {
+					test.logf("Failed to create temporary subdir in VTDATAROOT: %v", vtDataRoot)
+					mu.Lock()
+					failed++
+					mu.Unlock()
+					continue
+				}
 
-					// Make a unique VTDATAROOT.
-					dataDir, err := os.MkdirTemp(vtDataRoot, "vt_")
-					if err != nil {
-						test.logf("Failed to create temporary subdir in VTDATAROOT: %v", vtDataRoot)
-						mu.Lock()
-						failed++
-						mu.Unlock()
-						break
-					}
+				// Run the test.
+				start := time.Now()
+				output, err := test.run(vtRoot, dataDir)
+				duration := time.Since(start)
 
-					// Run the test.
-					start := time.Now()
-					output, err := test.run(vtRoot, dataDir)
-					duration := time.Since(start)
-
-					// Save/print test output.
-					if err != nil || *logPass {
-						if *printLog && !*follow {
-							test.logf("%s\n", output)
-						}
-						outFile := fmt.Sprintf("%v.%v-%v.%v.log", test.flavor, test.name, test.runIndex+1, try)
-						outFilePath := path.Join(outDir, outFile)
-						test.logf("saving test output to %v", outFilePath)
-						if fileErr := os.WriteFile(outFilePath, output, os.FileMode(0644)); fileErr != nil {
-							test.logf("WriteFile error: %v", fileErr)
-						}
+				// Save/print test output.
+				if err != nil || *logPass {
+					if *printLog && !*follow {
+						test.logf("%s\n", output)
 					}
-
-					// Clean up the unique VTDATAROOT.
-					if !*keepData {
-						if err := os.RemoveAll(dataDir); err != nil {
-							test.logf("WARNING: can't remove temporary VTDATAROOT: %v", err)
-						}
+					outFile := fmt.Sprintf("%v.%v-%v.log", test.flavor, test.name, test.runIndex+1)
+					outFilePath := path.Join(outDir, outFile)
+					test.logf("saving test output to %v", outFilePath)
+					if fileErr := os.WriteFile(outFilePath, output, os.FileMode(0644)); fileErr != nil {
+						test.logf("WriteFile error: %v", fileErr)
 					}
+				}
 
-					if err != nil {
-						// This try failed.
-						test.logf("FAILED (try %v/%v) in %v: %v", try, tryMax, round(duration), err)
-						mu.Lock()
-						testFailed(test.name)
-						mu.Unlock()
-						continue
+				// Clean up the unique VTDATAROOT.
+				if !*keepData {
+					if err := os.RemoveAll(dataDir); err != nil {
+						test.logf("WARNING: can't remove temporary VTDATAROOT: %v", err)
 					}
+				}
 
+				if err != nil {
+					test.logf("FAILED in %v: %v", round(duration), err)
 					mu.Lock()
-					testPassed(test.name, duration)
-
-					if try == 1 {
-						// Passed on the first try.
-						test.logf("PASSED in %v", round(duration))
-						passed++
-					} else {
-						// Passed, but not on the first try.
-						test.logf("FLAKY (1/%v passed in %v)", try, round(duration))
-						flaky++
-						testFlaked(test.name, try)
-					}
+					testFailed(test.name)
 					mu.Unlock()
-					break
+					continue
 				}
+
+				mu.Lock()
+				testPassed(test.name, duration)
+				test.logf("PASSED in %v", round(duration))
+				passed++
+				mu.Unlock()
 			}
 		}()
 	}
diff --git a/test/README.md b/test/README.md
index 6579245ef45..196e3f05d06 100644
--- a/test/README.md
+++ b/test/README.md
@@ -26,15 +26,15 @@ Each test is of the form:
 ```javascript
 "vtgate": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate"],
+			"Packages": ["vitess.io/vitess/go/test/endtoend/vtgate"],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": 17,
-			"RetryMax": 0,
 			"Tags": []
 		},
 ```
-The important parameters here are Args which define the arguments to `go test` and the Shard which says 
+The important parameters here are Packages which define the Go packages to test, Args for any `go test` flags, and the Shard which says 
 which Test VM should run this test. All tests which have a common Shard value are run in the same test vm.
 
 ### Known Issue
diff --git a/test/config.json b/test/config.json
index ab1fa3d00ac..f124c6ea34c 100644
--- a/test/config.json
+++ b/test/config.json
@@ -2,6 +2,7 @@
 	"Tests": {
 		"java": {
 			"File": "",
+			"Packages": [],
 			"Args": [],
 			"Command": [
 				"make",
@@ -9,33 +10,33 @@
 			],
 			"Manual": false,
 			"Shard": "java",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"client_test": {
 			"File": "",
+			"Packages": [],
 			"Args": [],
 			"Command": [
 				"test/client_test.sh"
 			],
 			"Manual": false,
 			"Shard": "java",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"e2e": {
 			"File": "",
+			"Packages": [],
 			"Args": [],
 			"Command": [
 				"tools/e2e_test_runner.sh"
 			],
 			"Manual": false,
 			"Shard": "",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"e2e_race": {
 			"File": "",
+			"Packages": [],
 			"Args": [],
 			"Command": [
 				"make",
@@ -43,22 +44,22 @@
 			],
 			"Manual": false,
 			"Shard": "",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"unit": {
 			"File": "",
+			"Packages": [],
 			"Args": [],
 			"Command": [
 				"tools/unit_test_runner.sh"
 			],
 			"Manual": false,
 			"Shard": "",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"unit_race": {
 			"File": "",
+			"Packages": [],
 			"Args": [],
 			"Command": [
 				"make",
@@ -66,1420 +67,2019 @@
 			],
 			"Manual": false,
 			"Shard": "5",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"local_example": {
 			"File": "",
+			"Packages": [],
 			"Args": [],
 			"Command": [
 				"test/local_example.sh"
 			],
 			"Manual": false,
 			"Shard": "",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"region_example": {
 			"File": "",
+			"Packages": [],
 			"Args": [],
 			"Command": [
 				"test/region_example.sh"
 			],
 			"Manual": false,
 			"Shard": "",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"backup_pitr": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/backup/pitr", "-timeout", "30m"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/backup/pitr"
+			],
+			"Args": [
+				"-timeout",
+				"30m"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "backup_pitr",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"backup_pitr_xtrabackup": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/backup/pitr_xtrabackup", "-timeout", "30m"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/backup/pitr_xtrabackup"
+			],
+			"Args": [
+				"-timeout",
+				"30m"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "backup_pitr_xtrabackup",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"backup_pitr_mysqlshell": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/backup/pitr_mysqlshell", "-timeout", "30m"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/backup/pitr_mysqlshell"
+			],
+			"Args": [
+				"-timeout",
+				"30m"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "backup_pitr_mysqlshell",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"backup": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/backup/vtctlbackup", "-timeout", "30m"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/backup/vtctlbackup"
+			],
+			"Args": [
+				"-timeout",
+				"30m"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtctlbackup_sharded_clustertest_heavy",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"backup_mysqlctld": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/backup/mysqlctld", "-timeout", "30m"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/backup/mysqlctld"
+			],
+			"Args": [
+				"-timeout",
+				"30m"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "21",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"backup_s3": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/backup/s3", "-timeout", "30m"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/backup/s3"
+			],
+			"Args": [
+				"-timeout",
+				"30m"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "21",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"backup_only": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/backup/vtbackup", "-timeout", "20m"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/backup/vtbackup"
+			],
+			"Args": [
+				"-timeout",
+				"20m"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtbackup",
-			"RetryMax": 1,
-			"Tags": ["upgrade_downgrade_backups"]
+			"Tags": [
+				"upgrade_downgrade_backups"
+			]
 		},
 		"backup_xtrabackup": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/backup/xtrabackup", "-timeout", "30m"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/backup/xtrabackup"
+			],
+			"Args": [
+				"-timeout",
+				"30m"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "xb_backup",
-			"RetryMax": 2,
 			"Tags": []
 		},
 		"backup_xtrabackup_xbstream": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/backup/xtrabackupstream", "-run", "XtrabackupStream", "-timeout", "30m"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/backup/xtrabackupstream"
+			],
+			"Args": [
+				"-run",
+				"XtrabackupStream",
+				"-timeout",
+				"30m"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "xb_backup",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"backup_xtrabackup_xbstream_lz4": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/backup/xtrabackupstream", "-run", "XtrabackupStreamWithlz4Compression", "-timeout", "30m"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/backup/xtrabackupstream"
+			],
+			"Args": [
+				"-run",
+				"XtrabackupStreamWithlz4Compression",
+				"-timeout",
+				"30m"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "xb_backup",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"cellalias": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/cellalias"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/cellalias"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "13",
-			"RetryMax": 3,
 			"Tags": []
 		},
 		"prepare_statement": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/preparestmt"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/preparestmt"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "12",
-			"RetryMax": 1,
-			"Tags": ["upgrade_downgrade_query_serving_queries"]
+			"Tags": [
+				"upgrade_downgrade_query_serving_queries"
+			]
 		},
 		"mysql_server": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/mysqlserver"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/mysqlserver"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "mysql_server_vault",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"messaging": {
 			"File": "messaging_test.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/messaging"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/messaging"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "12",
-			"RetryMax": 3,
 			"Tags": []
 		},
 		"clustertest": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/clustertest"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/clustertest"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtctlbackup_sharded_clustertest_heavy",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"encrypted_replication": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/encryption/encryptedreplication"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/encryption/encryptedreplication"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "12",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"encrypted_transport": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/encryption/encryptedtransport"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/encryption/encryptedtransport"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "12",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"keyspace": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/keyspace"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/keyspace"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "12",
-			"RetryMax": 1,
 			"Tags": [
 				"site_test"
 			]
 		},
 		"mysqlctl": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/mysqlctl"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/mysqlctl"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "12",
-			"RetryMax": 1,
 			"Tags": [
 				"site_test"
 			]
 		},
 		"mysqlctld": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/mysqlctld"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/mysqlctld"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "12",
-			"RetryMax": 1,
 			"Tags": [
 				"site_test"
 			]
 		},
 		"onlineddl_vrepl": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/onlineddl/vrepl", "-timeout", "30m"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/onlineddl/vrepl"
+			],
+			"Args": [
+				"-timeout",
+				"30m"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "onlineddl_vrepl",
-			"RetryMax": 2,
 			"Tags": []
 		},
 		"onlineddl_vrepl_stress": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/onlineddl/vrepl_stress", "-timeout", "30m"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/onlineddl/vrepl_stress"
+			],
+			"Args": [
+				"-timeout",
+				"30m"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "onlineddl_vrepl_stress",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"onlineddl_vrepl_suite": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/onlineddl/vrepl_suite", "-timeout", "30m"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/onlineddl/vrepl_suite"
+			],
+			"Args": [
+				"-timeout",
+				"30m"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "onlineddl_vrepl_suite",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"onlineddl_vrepl_stress_suite": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/onlineddl/vrepl_stress_suite", "-timeout", "30m"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/onlineddl/vrepl_stress_suite"
+			],
+			"Args": [
+				"-timeout",
+				"30m"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "onlineddl_vrepl_stress_suite",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"onlineddl_revert": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/onlineddl/revert", "-timeout", "30m"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/onlineddl/revert"
+			],
+			"Args": [
+				"-timeout",
+				"30m"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "onlineddl_revert",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"onlineddl_scheduler": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/onlineddl/scheduler", "-timeout", "30m"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/onlineddl/scheduler"
+			],
+			"Args": [
+				"-timeout",
+				"30m"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "onlineddl_scheduler",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"onlineddl_flow": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/onlineddl/flow", "-timeout", "30m"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/onlineddl/flow"
+			],
+			"Args": [
+				"-timeout",
+				"30m"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "onlineddl_flow",
-			"RetryMax": 1,
-			"Tags": ["upgrade_downgrade_onlineddl_flow"]
+			"Tags": [
+				"upgrade_downgrade_onlineddl_flow"
+			]
 		},
 		"schemadiff_vrepl": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/schemadiff/vrepl", "-timeout", "30m"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/schemadiff/vrepl"
+			],
+			"Args": [
+				"-timeout",
+				"30m"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "schemadiff_vrepl",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"recovery": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/recovery/unshardedrecovery"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/recovery/unshardedrecovery"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtctlbackup_sharded_clustertest_heavy",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"emergencyreparent": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/reparent/emergencyreparent", "-timeout", "20m"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/reparent/emergencyreparent"
+			],
+			"Args": [
+				"-timeout",
+				"20m"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "ers_prs_newfeatures_heavy",
-			"RetryMax": 1,
-			"Tags": ["upgrade_downgrade_reparent"]
+			"Tags": [
+				"upgrade_downgrade_reparent"
+			]
 		},
 		"plannedreparent": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/reparent/plannedreparent", "-timeout", "20m"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/reparent/plannedreparent"
+			],
+			"Args": [
+				"-timeout",
+				"20m"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "ers_prs_newfeatures_heavy",
-			"RetryMax": 1,
-			"Tags": ["upgrade_downgrade_reparent"]
+			"Tags": [
+				"upgrade_downgrade_reparent"
+			]
 		},
 		"newfeatures": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/reparent/newfeaturetest"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/reparent/newfeaturetest"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "ers_prs_newfeatures_heavy",
-			"RetryMax": 1,
-			"Tags": [""]
+			"Tags": [
+				""
+			]
 		},
 		"sharded": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/sharded", "-timeout", "30m"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/sharded"
+			],
+			"Args": [
+				"-timeout",
+				"30m"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtctlbackup_sharded_clustertest_heavy",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"tabletgateway_buffer_reparent": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/tabletgateway/buffer/reparent"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/tabletgateway/buffer/reparent"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "13",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"tabletgateway_buffer_reshard": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/tabletgateway/buffer/reshard"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/tabletgateway/buffer/reshard"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "13",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"tabletgateway": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/tabletgateway"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/tabletgateway"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "15",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"tabletmanager": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/tabletmanager"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/tabletmanager"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "18",
-			"RetryMax": 1,
 			"Tags": [
 				"site_test"
 			]
 		},
 		"tabletmanager_replication_manager": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/tabletmanager/replication_manager"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/tabletmanager/replication_manager"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "18",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"tabletmanager_consul": {
 			"File": "unused.go",
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/tabletmanager"
+			],
 			"Args": [
-				"vitess.io/vitess/go/test/endtoend/tabletmanager","--topo-flavor=consul"
+				"--topo-flavor=consul"
 			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "tabletmanager_consul",
-			"RetryMax": 1,
 			"Tags": [
 				"site_test"
 			]
 		},
 		"tabletmanager_throttler_topo": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/tabletmanager/throttler_topo"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/tabletmanager/throttler_topo"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "tabletmanager_throttler_topo",
-			"RetryMax": 1,
 			"Tags": [
 				"site_test"
 			]
 		},
 		"tabletmanager_tablegc": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/tabletmanager/tablegc"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/tabletmanager/tablegc"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "tabletmanager_tablegc",
-			"RetryMax": 2,
 			"Tags": [
 				"site_test"
 			]
 		},
 		"tabletmanager_zk2": {
 			"File": "unused.go",
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/tabletmanager"
+			],
 			"Args": [
-				"vitess.io/vitess/go/test/endtoend/tabletmanager","--topo-flavor=zk2"
+				"--topo-flavor=zk2"
 			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "docker_cluster",
-			"RetryMax": 1,
 			"Tags": [
 				"site_test"
 			]
 		},
 		"upgrade": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/versionupgrade", "-keep-data", "-force-vtdataroot", "/tmp/vtdataroot/vtroot_10901", "-force-port-start", "vtctlbackup_sharded_clustertest_heavy900", "-force-base-tablet-uid", "vtctlbackup_sharded_clustertest_heavy90"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/versionupgrade"
+			],
+			"Args": [
+				"-keep-data",
+				"-force-vtdataroot",
+				"/tmp/vtdataroot/vtroot_10901",
+				"-force-port-start",
+				"vtctlbackup_sharded_clustertest_heavy900",
+				"-force-base-tablet-uid",
+				"vtctlbackup_sharded_clustertest_heavy90"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "28",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_general_heavy",
-			"RetryMax": 2,
 			"Tags": []
 		},
 		"vtgate_connectiondrain": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/connectiondrain"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/connectiondrain"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_general_heavy",
-			"RetryMax": 2,
 			"Tags": []
 		},
 		"vtgate_queries_derived": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/queries/derived"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/queries/derived"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_queries",
-			"RetryMax": 1,
-			"Tags": ["upgrade_downgrade_query_serving_queries"]
+			"Tags": [
+				"upgrade_downgrade_query_serving_queries"
+			]
 		},
 		"vtgate_queries_aggregation": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/queries/aggregation"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/queries/aggregation"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_queries",
-			"RetryMax": 2,
-			"Tags": ["upgrade_downgrade_query_serving_queries"]
+			"Tags": [
+				"upgrade_downgrade_query_serving_queries"
+			]
 		},
 		"vtgate_queries_foundrows": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/queries/foundrows"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/queries/foundrows"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_queries",
-			"RetryMax": 2,
-			"Tags": ["upgrade_downgrade_query_serving_queries"]
+			"Tags": [
+				"upgrade_downgrade_query_serving_queries"
+			]
 		},
 		"vtgate_queries_informationschema": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/queries/informationschema"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/queries/informationschema"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_queries",
-			"RetryMax": 2,
-			"Tags": ["upgrade_downgrade_query_serving_queries"]
+			"Tags": [
+				"upgrade_downgrade_query_serving_queries"
+			]
 		},
 		"vtgate_queries_misc": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/queries/misc"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/queries/misc"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_queries",
-			"RetryMax": 1,
-			"Tags": ["upgrade_downgrade_query_serving_queries"]
+			"Tags": [
+				"upgrade_downgrade_query_serving_queries"
+			]
 		},
 		"vtgate_queries_multi_query": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/queries/multi_query"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/queries/multi_query"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_queries",
-			"RetryMax": 1,
-			"Tags": ["upgrade_downgrade_query_serving_queries"]
+			"Tags": [
+				"upgrade_downgrade_query_serving_queries"
+			]
 		},
 		"vtgate_queries_timeout": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/queries/timeout"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/queries/timeout"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_queries",
-			"RetryMax": 1,
-			"Tags": ["upgrade_downgrade_query_serving_queries"]
+			"Tags": [
+				"upgrade_downgrade_query_serving_queries"
+			]
 		},
 		"vtgate_queries_normalize": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/queries/normalize"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/queries/normalize"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_queries",
-			"RetryMax": 2,
-			"Tags": ["upgrade_downgrade_query_serving_queries"]
+			"Tags": [
+				"upgrade_downgrade_query_serving_queries"
+			]
 		},
 		"vtgate_queries_no_scatter": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/queries/no_scatter"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/queries/no_scatter"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_queries",
-			"RetryMax": 1,
-			"Tags": ["upgrade_downgrade_query_serving_queries"]
+			"Tags": [
+				"upgrade_downgrade_query_serving_queries"
+			]
 		},
 		"vtgate_queries_orderby": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/queries/orderby", "-timeout", "20m"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/queries/orderby"
+			],
+			"Args": [
+				"-timeout",
+				"20m"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_queries",
-			"RetryMax": 2,
-			"Tags": ["upgrade_downgrade_query_serving_queries"]
+			"Tags": [
+				"upgrade_downgrade_query_serving_queries"
+			]
 		},
 		"vtgate_queries_tpch": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/queries/tpch", "-timeout", "20m"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/queries/tpch"
+			],
+			"Args": [
+				"-timeout",
+				"20m"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_queries",
-			"RetryMax": 2,
-			"Tags": ["upgrade_downgrade_query_serving_queries_2"]
+			"Tags": [
+				"upgrade_downgrade_query_serving_queries_2"
+			]
 		},
 		"vtgate_queries_subquery": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/queries/subquery", "-timeout", "20m"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/queries/subquery"
+			],
+			"Args": [
+				"-timeout",
+				"20m"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_queries",
-			"RetryMax": 2,
-			"Tags": ["upgrade_downgrade_query_serving_queries_2"]
+			"Tags": [
+				"upgrade_downgrade_query_serving_queries_2"
+			]
 		},
 		"vtgate_queries_union": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/queries/union", "-timeout", "20m"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/queries/union"
+			],
+			"Args": [
+				"-timeout",
+				"20m"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_queries",
-			"RetryMax": 2,
-			"Tags": ["upgrade_downgrade_query_serving_queries_2"]
+			"Tags": [
+				"upgrade_downgrade_query_serving_queries_2"
+			]
 		},
 		"vtgate_queries_insert": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/queries/dml"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/queries/dml"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_queries",
-			"RetryMax": 2,
-			"Tags": ["upgrade_downgrade_query_serving_queries_2"]
+			"Tags": [
+				"upgrade_downgrade_query_serving_queries_2"
+			]
 		},
 		"vtgate_queries_vexplain": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/queries/vexplain"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/queries/vexplain"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_queries",
-			"RetryMax": 2,
-			"Tags": ["upgrade_downgrade_query_serving_queries_2"]
+			"Tags": [
+				"upgrade_downgrade_query_serving_queries_2"
+			]
 		},
 		"vtgate_queries_reference": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/queries/reference"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/queries/reference"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_queries",
-			"RetryMax": 1,
-			"Tags": ["upgrade_downgrade_query_serving_queries_2"]
+			"Tags": [
+				"upgrade_downgrade_query_serving_queries_2"
+			]
 		},
 		"vtgate_queries_random": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/queries/random"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/queries/random"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_queries",
-			"RetryMax": 1,
-			"Tags": ["upgrade_downgrade_query_serving_queries_2"]
+			"Tags": [
+				"upgrade_downgrade_query_serving_queries_2"
+			]
 		},
 		"vtgate_kill": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/queries/kill"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/queries/kill"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_queries",
-			"RetryMax": 1,
-			"Tags": ["upgrade_downgrade_query_serving_queries_2"]
+			"Tags": [
+				"upgrade_downgrade_query_serving_queries_2"
+			]
 		},
 		"vtgate_concurrentdml": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/concurrentdml"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/concurrentdml"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_concurrentdml",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_schema": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/schema", "-timeout", "20m"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/schema"
+			],
+			"Args": [
+				"-timeout",
+				"20m"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_schema",
-			"RetryMax": 1,
-			"Tags": ["upgrade_downgrade_query_serving_schema"]
+			"Tags": [
+				"upgrade_downgrade_query_serving_schema"
+			]
 		},
 		"vtgate_schematracker_loadkeyspace": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/schematracker/loadkeyspace"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/schematracker/loadkeyspace"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_schema_tracker",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_schematracker_restarttablet": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/schematracker/restarttablet"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/schematracker/restarttablet"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_schema_tracker",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_schematracker_sharded": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/schematracker/sharded", "-timeout", "20m"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/schematracker/sharded"
+			],
+			"Args": [
+				"-timeout",
+				"20m"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_schema_tracker",
-			"RetryMax": 1,
-			"Tags": ["upgrade_downgrade_query_serving_schema"]
+			"Tags": [
+				"upgrade_downgrade_query_serving_schema"
+			]
 		},
 		"vtgate_schematracker_sharded_prs": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/schematracker/sharded_prs", "-timeout", "20m"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/schematracker/sharded_prs"
+			],
+			"Args": [
+				"-timeout",
+				"20m"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_schema_tracker",
-			"RetryMax": 1,
-			"Tags": ["upgrade_downgrade_query_serving_schema"]
+			"Tags": [
+				"upgrade_downgrade_query_serving_schema"
+			]
 		},
 		"vtgate_schematracker_unsharded": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/schematracker/unsharded", "-timeout", "20m"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/schematracker/unsharded"
+			],
+			"Args": [
+				"-timeout",
+				"20m"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_schema_tracker",
-			"RetryMax": 1,
-			"Tags": ["upgrade_downgrade_query_serving_schema"]
+			"Tags": [
+				"upgrade_downgrade_query_serving_schema"
+			]
 		},
 		"vtgate_schematracker_viewsdisabled": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/schematracker/viewsdisabled", "-timeout", "20m"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/schematracker/viewsdisabled"
+			],
+			"Args": [
+				"-timeout",
+				"20m"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_schema_tracker",
-			"RetryMax": 1,
-			"Tags": ["upgrade_downgrade_query_serving_schema"]
+			"Tags": [
+				"upgrade_downgrade_query_serving_schema"
+			]
 		},
 		"vtgate_mysql84": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/mysql84"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/mysql84"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "mysql84",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_sequence": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/sequence"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/sequence"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_general_heavy",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_setstatement": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/reservedconn"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/reservedconn"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_reservedconn",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_reserved_conn1": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/reservedconn/reconnect1"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/reservedconn/reconnect1"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_reservedconn",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_reserved_conn2": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/reservedconn/reconnect2"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/reservedconn/reconnect2"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_reservedconn",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_reserved_conn3": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/reservedconn/reconnect3"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/reservedconn/reconnect3"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_reservedconn",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_reserved_conn4": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/reservedconn/reconnect4"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/reservedconn/reconnect4"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_reservedconn",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_tablet_healthcheck_cache": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/tablet_healthcheck_cache", "-timeout", "45m"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/tablet_healthcheck_cache"
+			],
+			"Args": [
+				"-timeout",
+				"45m"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_tablet_healthcheck_cache",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_transaction": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/transaction"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/transaction"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_transaction",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_transaction_restart": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/transaction/restart"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/transaction/restart"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_transaction",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_transaction_rollback": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/transaction/rollback"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/transaction/rollback"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_transaction",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_transaction_single": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/transaction/single"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/transaction/single"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_transaction",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_transaction_twopc": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/transaction/twopc"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/transaction/twopc"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_transaction",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_transaction_twopc_metric": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/transaction/twopc/metric"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/transaction/twopc/metric"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_transaction",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_transaction_twopc_stress": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/transaction/twopc/stress"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/transaction/twopc/stress"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_transaction",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_transaction_twopc_fuzz": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/transaction/twopc/fuzz"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/transaction/twopc/fuzz"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_transaction",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_transaction_partial_exec": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/partialfailure"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/partialfailure"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_transaction",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_plantests": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/plan_tests"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/plan_tests"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_plantests",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_unsharded": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/unsharded"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/unsharded"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_unsharded",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_vschema": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/vschema", "-timeout", "20m"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/vschema"
+			],
+			"Args": [
+				"-timeout",
+				"20m"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_vschema",
-			"RetryMax": 1,
-			"Tags": ["upgrade_downgrade_query_serving_schema"]
+			"Tags": [
+				"upgrade_downgrade_query_serving_schema"
+			]
 		},
 		"vtgate_readafterwrite": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/readafterwrite"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/readafterwrite"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_readafterwrite",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_dbddlplugin": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/createdb_plugin"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/createdb_plugin"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_general_heavy",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_foreignkey": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/foreignkey"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/foreignkey"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_foreignkey_stress",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_foreignkey_routing": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/foreignkey/routing"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/foreignkey/routing"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_foreignkey_stress",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_foreignkey_stress": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/foreignkey/stress", "-timeout", "30m"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/foreignkey/stress"
+			],
+			"Args": [
+				"-timeout",
+				"30m"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_foreignkey_stress",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_gen4": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/gen4"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/gen4"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_gen4",
-			"RetryMax": 2,
 			"Tags": []
 		},
 		"vtgate_godriver": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/godriver"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/godriver"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_godriver",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_watchkeyspace": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/keyspace_watches"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/keyspace_watches"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_topo",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_grpc_api": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/grpc_api"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/grpc_api"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_general_heavy",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"topo_zk2": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/topotest/zk2", "--topo-flavor=zk2"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/topotest/zk2"
+			],
+			"Args": [
+				"--topo-flavor=zk2"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "docker_cluster",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"topo_consul": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/topotest/consul", "--topo-flavor=consul"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/topotest/consul"
+			],
+			"Args": [
+				"--topo-flavor=consul"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_topo_consul",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"topo_etcd2": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/topotest/etcd2"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/topotest/etcd2"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_topo_etcd",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"errs_as_warns": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/errors_as_warnings"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/errors_as_warnings"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_general_heavy",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"consolidator": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/consolidator"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/consolidator"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_general_heavy",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"prefixfanout": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/prefixfanout"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/prefixfanout"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_vindex_heavy",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vindex_bindvars": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/vindex_bindvars"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/vindex_bindvars"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_vindex_heavy",
-			"RetryMax": 2,
 			"Tags": []
 		},
 		"vindex_secondary": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/sec_vind"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/sec_vind"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_vindex_heavy",
-			"RetryMax": 2,
 			"Tags": []
 		},
 		"vttest_sample": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtcombo"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtcombo"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "docker_cluster",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"xb_recovery": {
 			"File": "recovery_test.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/recovery/xtrabackup"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/recovery/xtrabackup"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "xb_recovery",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vreplication_materialize": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vreplication", "-run", "Materialize"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vreplication"
+			],
+			"Args": [
+				"-run",
+				"Materialize"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vreplication_partial_movetables_and_materialize",
-			"RetryMax": 0,
 			"Tags": []
 		},
 		"vreplication_vtctldclient_materialize": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vreplication", "-run", "TestMaterializeVtctldClient"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vreplication"
+			],
+			"Args": [
+				"-run",
+				"TestMaterializeVtctldClient"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vreplication_partial_movetables_and_materialize",
-			"RetryMax": 0,
 			"Tags": []
 		},
 		"vreplication_cellalias": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vreplication", "-run", "CellAlias"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vreplication"
+			],
+			"Args": [
+				"-run",
+				"CellAlias"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vreplication_cellalias",
-			"RetryMax": 0,
 			"Tags": []
 		},
 		"vreplication_movetables_ignore_source_keyspace": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vreplication", "-run", "TestMoveTablesIgnoreSourceKeyspace"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vreplication"
+			],
+			"Args": [
+				"-run",
+				"TestMoveTablesIgnoreSourceKeyspace"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vreplication_cellalias",
-			"RetryMax": 0,
 			"Tags": []
 		},
 		"vreplication_multi_tenant": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vreplication","-run", "MultiTenant"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vreplication"
+			],
+			"Args": [
+				"-run",
+				"MultiTenant"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vreplication_multi_tenant",
-			"RetryMax": 0,
 			"Tags": []
 		},
 		"vreplication_partial_movetables_basic": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vreplication", "-run", "PartialMoveTablesBasic"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vreplication"
+			],
+			"Args": [
+				"-run",
+				"PartialMoveTablesBasic"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vreplication_partial_movetables_and_materialize",
-			"RetryMax": 0,
 			"Tags": []
 		},
 		"vdiff_multiple_movetables_test.go": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vreplication", "-run", "TestMultipleConcurrentVDiffs"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vreplication"
+			],
+			"Args": [
+				"-run",
+				"TestMultipleConcurrentVDiffs"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vreplication_partial_movetables_and_materialize",
-			"RetryMax": 0,
 			"Tags": []
 		},
 		"vreplication_movetables_buffering": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vreplication", "-run", "TestMoveTablesBuffering"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vreplication"
+			],
+			"Args": [
+				"-run",
+				"TestMoveTablesBuffering"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vreplication_cellalias",
-			"RetryMax": 0,
 			"Tags": []
 		},
 		"vreplication_onlineddl_vdiff": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vreplication", "-run", "TestOnlineDDLVDiff"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vreplication"
+			],
+			"Args": [
+				"-run",
+				"TestOnlineDDLVDiff"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vreplication_cellalias",
-			"RetryMax": 2,
 			"Tags": []
 		},
 		"vreplication_vschema_load": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vreplication", "-run", "TestVSchemaChangesUnderLoad"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vreplication"
+			],
+			"Args": [
+				"-run",
+				"TestVSchemaChangesUnderLoad"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vreplication_cellalias",
-			"RetryMax": 2,
 			"Tags": []
 		},
 		"sidecardb": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vreplication", "-run", "TestSidecarDB"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vreplication"
+			],
+			"Args": [
+				"-run",
+				"TestSidecarDB"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "schemadiff_vrepl",
-			"RetryMax": 2,
 			"Tags": []
 		},
 		"vreplication_basic": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vreplication", "-run", "TestBasicVreplicationWorkflow", "-timeout", "20m"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vreplication"
+			],
+			"Args": [
+				"-run",
+				"TestBasicVreplicationWorkflow",
+				"-timeout",
+				"20m"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vreplication_basic",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vreplication_copy_parallel": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vreplication", "-run", "TestVreplicationCopyParallel", "-timeout", "20m"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vreplication"
+			],
+			"Args": [
+				"-run",
+				"TestVreplicationCopyParallel",
+				"-timeout",
+				"20m"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vreplication_copy_parallel",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vreplication_partial_movetables_sequences": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vreplication", "-run", "TestPartialMoveTablesWithSequences"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vreplication"
+			],
+			"Args": [
+				"-run",
+				"TestPartialMoveTablesWithSequences"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vreplication_partial_movetables_and_materialize",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vreplication_sequence_reset_on_switch_traffic": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vreplication", "-run", "TestSequenceResetOnSwitchTraffic"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vreplication"
+			],
+			"Args": [
+				"-run",
+				"TestSequenceResetOnSwitchTraffic"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vreplication_partial_movetables_and_materialize",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vstream_flush_binlog": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vreplication", "-run", "TestVStreamFlushBinlog"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vreplication"
+			],
+			"Args": [
+				"-run",
+				"TestVStreamFlushBinlog"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vreplication_basic",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"multi_vstreams_keyspace_reshard": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vreplication", "-run", "TestMultiVStreamsKeyspaceReshard", "-timeout", "15m"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vreplication"
+			],
+			"Args": [
+				"-run",
+				"TestMultiVStreamsKeyspaceReshard",
+				"-timeout",
+				"15m"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vstream",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vstream_failover": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vreplication", "-run", "VStreamFailover"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vreplication"
+			],
+			"Args": [
+				"-run",
+				"VStreamFailover"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vstream",
-			"RetryMax": 3,
 			"Tags": []
 		},
 		"vstream_stoponreshard_true": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vreplication", "-run", "VStreamStopOnReshardTrue"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vreplication"
+			],
+			"Args": [
+				"-run",
+				"VStreamStopOnReshardTrue"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vstream",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vstream_stoponreshard_false": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vreplication", "-run", "VStreamStopOnReshardFalse"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vreplication"
+			],
+			"Args": [
+				"-run",
+				"VStreamStopOnReshardFalse"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vstream",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vstream_with_keyspaces_to_watch": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vreplication", "-run", "VStreamWithKeyspacesToWatch"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vreplication"
+			],
+			"Args": [
+				"-run",
+				"VStreamWithKeyspacesToWatch"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vstream",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtop_example": {
 			"File": "",
+			"Packages": [],
 			"Args": [],
 			"Command": [
 				"test/vtop_example.sh"
 			],
 			"Manual": false,
 			"Shard": "",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtorc_primary_failure": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtorc/primaryfailure"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtorc/primaryfailure"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtorc",
-			"RetryMax": 3,
 			"Tags": []
 		},
 		"vtorc_api": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtorc/api"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtorc/api"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtorc",
-			"RetryMax": 3,
 			"Tags": []
 		},
 		"vtorc_general": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtorc/general"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtorc/general"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtorc",
-			"RetryMax": 3,
 			"Tags": []
 		},
 		"vtorc_readtopologyinstance": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtorc/readtopologyinstance"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtorc/readtopologyinstance"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtorc",
-			"RetryMax": 3,
 			"Tags": []
 		},
 		"vault": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vault"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vault"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "mysql_server_vault",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vreplication_v2": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vreplication", "-run", "TestBasicV2Workflows", "-timeout", "30m"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vreplication"
+			],
+			"Args": [
+				"-run",
+				"TestBasicV2Workflows",
+				"-timeout",
+				"30m"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vreplication_v2",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"global_routing": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vreplication", "-run", "TestGlobalRouting", "-timeout", "30m"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vreplication"
+			],
+			"Args": [
+				"-run",
+				"TestGlobalRouting",
+				"-timeout",
+				"30m"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vreplication_v2",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vreplication_fk": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vreplication", "-run", "TestFKWorkflow"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vreplication"
+			],
+			"Args": [
+				"-run",
+				"TestFKWorkflow"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vreplication_cellalias",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vreplication_foreign_key_stress": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vreplication", "-run", "TestFKExt"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vreplication"
+			],
+			"Args": [
+				"-run",
+				"TestFKExt"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vreplication_foreign_key_stress",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vreplication_across_db_versions": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vreplication", "-run", "TestV2WorkflowsAcrossDBVersions", "-timeout", "20m"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vreplication"
+			],
+			"Args": [
+				"-run",
+				"TestV2WorkflowsAcrossDBVersions",
+				"-timeout",
+				"20m"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vreplication_across_db_versions",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vreplication_mariadb_to_mysql": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vreplication", "-run", "TestMoveTablesMariaDBToMySQL", "-timeout", "20m"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vreplication"
+			],
+			"Args": [
+				"-run",
+				"TestMoveTablesMariaDBToMySQL",
+				"-timeout",
+				"20m"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vreplication_mariadb_to_mysql",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vreplication_migrate": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vreplication", "-run", "TestMigrate", "-timeout", "30m"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vreplication"
+			],
+			"Args": [
+				"-run",
+				"TestMigrate",
+				"-timeout",
+				"30m"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vreplication_migrate",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vdiff2": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vreplication", "-run", "TestVDiff2", "-timeout", "30m"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vreplication"
+			],
+			"Args": [
+				"-run",
+				"TestVDiff2",
+				"-timeout",
+				"30m"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vreplication_vdiff2",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vreplication_vtctldclient_cli": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vreplication", "-run", "TestVtctldclientCLI", "-timeout", "20m"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vreplication"
+			],
+			"Args": [
+				"-run",
+				"TestVtctldclientCLI",
+				"-timeout",
+				"20m"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vreplication_vtctldclient_movetables_tz",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vreplication_movetables_tz": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vreplication", "-run", "TestMoveTablesTZ"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vreplication"
+			],
+			"Args": [
+				"-run",
+				"TestMoveTablesTZ"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vreplication_vtctldclient_movetables_tz",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"loopkup_index": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vreplication", "-run", "TestLookupIndex"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vreplication"
+			],
+			"Args": [
+				"-run",
+				"TestLookupIndex"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vreplication_vtctldclient_movetables_tz",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtadmin": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtadmin"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtadmin"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "15",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"topo_connection_cache": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/topoconncache", "-run", "TestVtctldListAllTablets"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/topoconncache"
+			],
+			"Args": [
+				"-run",
+				"TestVtctldListAllTablets"
+			],
 			"Command": [],
 			"Manual": false,
 			"Shard": "topo_connection_cache",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"prscomplex": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/reparent/prscomplex"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/reparent/prscomplex"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vttablet_prscomplex",
-			"RetryMax": 1,
-			"Tags": [""]
+			"Tags": [
+				""
+			]
 		},
 		"prssettingspool": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/reparent/prssettingspool"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/reparent/prssettingspool"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vttablet_prscomplex",
-			"RetryMax": 1,
-			"Tags": [""]
+			"Tags": [
+				""
+			]
 		}
 	}
 }
diff --git a/test/config_partial_keyspace.json b/test/config_partial_keyspace.json
index bcd445d34bc..2c3570aad76 100644
--- a/test/config_partial_keyspace.json
+++ b/test/config_partial_keyspace.json
@@ -2,146 +2,193 @@
   "Tests": {
     "vtgate_partial_keyspace": {
       "File": "unused.go",
-      "Args": ["vitess.io/vitess/go/test/endtoend/vtgate"],
+      "Packages": [
+        "vitess.io/vitess/go/test/endtoend/vtgate"
+      ],
+      "Args": [],
       "Command": [],
       "Manual": false,
       "Shard": "vtgate_partial_keyspace",
-      "RetryMax": 2,
       "Tags": []
     },
     "vtgate_sequence_partial_keyspace": {
       "File": "unused.go",
-      "Args": ["vitess.io/vitess/go/test/endtoend/vtgate/sequence"],
+      "Packages": [
+        "vitess.io/vitess/go/test/endtoend/vtgate/sequence"
+      ],
+      "Args": [],
       "Command": [],
       "Manual": false,
       "Shard": "vtgate_partial_keyspace",
-      "RetryMax": 1,
       "Tags": []
     },
     "errs_as_warns_partial_keyspace": {
       "File": "unused.go",
-      "Args": ["vitess.io/vitess/go/test/endtoend/vtgate/errors_as_warnings"],
+      "Packages": [
+        "vitess.io/vitess/go/test/endtoend/vtgate/errors_as_warnings"
+      ],
+      "Args": [],
       "Command": [],
       "Manual": false,
       "Shard": "vtgate_partial_keyspace",
-      "RetryMax": 1,
       "Tags": []
     },
     "vtgate_transaction_partial_keyspace": {
       "File": "unused.go",
-      "Args": ["vitess.io/vitess/go/test/endtoend/transaction"],
+      "Packages": [
+        "vitess.io/vitess/go/test/endtoend/transaction"
+      ],
+      "Args": [],
       "Command": [],
       "Manual": false,
       "Shard": "vtgate_partial_keyspace",
-      "RetryMax": 1,
       "Tags": []
     },
     "vtgate_transaction_rollback_partial_keyspace": {
       "File": "unused.go",
-      "Args": ["vitess.io/vitess/go/test/endtoend/transaction/rollback"],
+      "Packages": [
+        "vitess.io/vitess/go/test/endtoend/transaction/rollback"
+      ],
+      "Args": [],
       "Command": [],
       "Manual": false,
       "Shard": "vtgate_partial_keyspace",
-      "RetryMax": 1,
       "Tags": []
     },
     "vtgate_transaction_single_partial_keyspace": {
       "File": "unused.go",
-      "Args": ["vitess.io/vitess/go/test/endtoend/transaction/single"],
+      "Packages": [
+        "vitess.io/vitess/go/test/endtoend/transaction/single"
+      ],
+      "Args": [],
       "Command": [],
       "Manual": false,
       "Shard": "vtgate_partial_keyspace",
-      "RetryMax": 1,
       "Tags": []
     },
     "vtgate_transaction_partial_exec_partial_keyspace": {
       "File": "unused.go",
-      "Args": ["vitess.io/vitess/go/test/endtoend/vtgate/partialfailure"],
+      "Packages": [
+        "vitess.io/vitess/go/test/endtoend/vtgate/partialfailure"
+      ],
+      "Args": [],
       "Command": [],
       "Manual": false,
       "Shard": "vtgate_partial_keyspace",
-      "RetryMax": 1,
       "Tags": []
     },
     "vtgate_queries_aggregation_partial_keyspace": {
       "File": "unused.go",
-      "Args": ["vitess.io/vitess/go/test/endtoend/vtgate/queries/aggregation"],
+      "Packages": [
+        "vitess.io/vitess/go/test/endtoend/vtgate/queries/aggregation"
+      ],
+      "Args": [],
       "Command": [],
       "Manual": false,
       "Shard": "vtgate_partial_keyspace",
-      "RetryMax": 2,
       "Tags": []
     },
     "vtgate_queries_foundrows_partial_keyspace": {
       "File": "unused.go",
-      "Args": ["vitess.io/vitess/go/test/endtoend/vtgate/queries/foundrows"],
+      "Packages": [
+        "vitess.io/vitess/go/test/endtoend/vtgate/queries/foundrows"
+      ],
+      "Args": [],
       "Command": [],
       "Manual": false,
       "Shard": "vtgate_partial_keyspace",
-      "RetryMax": 2,
       "Tags": []
     },
     "vtgate_queries_informationschema_partial_keyspace": {
       "File": "unused.go",
-      "Args": ["vitess.io/vitess/go/test/endtoend/vtgate/queries/informationschema"],
+      "Packages": [
+        "vitess.io/vitess/go/test/endtoend/vtgate/queries/informationschema"
+      ],
+      "Args": [],
       "Command": [],
       "Manual": false,
       "Shard": "vtgate_partial_keyspace",
-      "RetryMax": 2,
       "Tags": []
     },
     "vtgate_queries_misc_partial_keyspace": {
       "File": "unused.go",
-      "Args": ["vitess.io/vitess/go/test/endtoend/vtgate/queries/misc"],
+      "Packages": [
+        "vitess.io/vitess/go/test/endtoend/vtgate/queries/misc"
+      ],
+      "Args": [],
       "Command": [],
       "Manual": false,
       "Shard": "vtgate_partial_keyspace",
-      "RetryMax": 1,
       "Tags": []
     },
     "vtgate_queries_normalize_partial_keyspace": {
       "File": "unused.go",
-      "Args": ["vitess.io/vitess/go/test/endtoend/vtgate/queries/normalize"],
+      "Packages": [
+        "vitess.io/vitess/go/test/endtoend/vtgate/queries/normalize"
+      ],
+      "Args": [],
       "Command": [],
       "Manual": false,
       "Shard": "vtgate_partial_keyspace",
-      "RetryMax": 2,
       "Tags": []
     },
     "vtgate_queries_orderby_partial_keyspace": {
       "File": "unused.go",
-      "Args": ["vitess.io/vitess/go/test/endtoend/vtgate/queries/orderby", "-timeout", "20m"],
+      "Packages": [
+        "vitess.io/vitess/go/test/endtoend/vtgate/queries/orderby"
+      ],
+      "Args": [
+        "-timeout",
+        "20m"
+      ],
       "Command": [],
       "Manual": false,
       "Shard": "vtgate_partial_keyspace",
-      "RetryMax": 2,
-      "Tags": ["upgrade_downgrade_query_serving_queries"]
+      "Tags": [
+        "upgrade_downgrade_query_serving_queries"
+      ]
     },
     "vtgate_queries_subquery_partial_keyspace": {
       "File": "unused.go",
-      "Args": ["vitess.io/vitess/go/test/endtoend/vtgate/queries/subquery", "-timeout", "20m"],
+      "Packages": [
+        "vitess.io/vitess/go/test/endtoend/vtgate/queries/subquery"
+      ],
+      "Args": [
+        "-timeout",
+        "20m"
+      ],
       "Command": [],
       "Manual": false,
       "Shard": "vtgate_partial_keyspace",
-      "RetryMax": 2,
-      "Tags": ["upgrade_downgrade_query_serving_queries"]
+      "Tags": [
+        "upgrade_downgrade_query_serving_queries"
+      ]
     },
     "vtgate_queries_union_partial_keyspace": {
       "File": "unused.go",
-      "Args": ["vitess.io/vitess/go/test/endtoend/vtgate/queries/union", "-timeout", "20m"],
+      "Packages": [
+        "vitess.io/vitess/go/test/endtoend/vtgate/queries/union"
+      ],
+      "Args": [
+        "-timeout",
+        "20m"
+      ],
       "Command": [],
       "Manual": false,
       "Shard": "vtgate_partial_keyspace",
-      "RetryMax": 2,
-      "Tags": ["upgrade_downgrade_query_serving_queries"]
+      "Tags": [
+        "upgrade_downgrade_query_serving_queries"
+      ]
     },
     "vtgate_queries_insert_partial_keyspace": {
       "File": "unused.go",
-      "Args": ["vitess.io/vitess/go/test/endtoend/vtgate/queries/dml"],
+      "Packages": [
+        "vitess.io/vitess/go/test/endtoend/vtgate/queries/dml"
+      ],
+      "Args": [],
       "Command": [],
       "Manual": false,
       "Shard": "vtgate_partial_keyspace",
-      "RetryMax": 2,
       "Tags": []
     }
   }
diff --git a/test/templates/cluster_endtoend_test.tpl b/test/templates/cluster_endtoend_test.tpl
index e0b2af3f123..244cd6ddc65 100644
--- a/test/templates/cluster_endtoend_test.tpl
+++ b/test/templates/cluster_endtoend_test.tpl
@@ -140,8 +140,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@HEAD
 
     {{if .NeedsMinio }}
     - name: Install Minio
@@ -217,8 +215,7 @@ jobs:
 
         # Some of these tests require specific locales to be installed.
         # See https://github.com/cncf/automation/commit/49f2ad7a791a62ff7d038002bbb2b1f074eed5d5
-        # run the tests however you normally do, then produce a JUnit XML file
-        go run test.go -docker={{if .Docker}}true -flavor={{.Platform}}{{else}}false{{end}} -follow -shard {{.Shard}}{{if .PartialKeyspace}} -partial-keyspace=true {{end}}{{if .BuildTag}} -build-tag={{.BuildTag}} {{end}} | tee -a output.txt | go-junit-report -set-exit-code > report.xml
+        go run test.go -docker={{if .Docker}}true -flavor={{.Platform}}{{else}}false{{end}} -follow -shard {{.Shard}}{{if .PartialKeyspace}} -partial-keyspace=true {{end}}{{if .BuildTag}} -build-tag={{.BuildTag}} {{end}}
 
     - name: Record test results in launchable if PR is not a draft
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' && !cancelled()
@@ -226,15 +223,9 @@ jobs:
         # send recorded tests to launchable
         launchable record tests --build "$GITHUB_RUN_ID" go-test . || true
 
-    - name: Print test output
-      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
-      run: |
-        # print test output
-        cat output.txt
-
     - name: Test Summary
       if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
       with:
-        paths: "report.xml"
+        paths: "_test/junit/*.xml"
         show: "fail"
diff --git a/test/templates/cluster_endtoend_test_docker.tpl b/test/templates/cluster_endtoend_test_docker.tpl
index 6e7d8cf061f..94f2e7cd2c5 100644
--- a/test/templates/cluster_endtoend_test_docker.tpl
+++ b/test/templates/cluster_endtoend_test_docker.tpl
@@ -79,3 +79,10 @@ jobs:
         export VTDATAROOT="/tmp/"
 
         go run test.go -docker=true --follow -shard {{.Shard}}
+
+    - name: Test Summary
+      if: steps.changes.outputs.end_to_end == 'true' && !cancelled()
+      uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4
+      with:
+        paths: "_test/junit/*.xml"
+        show: "fail"
diff --git a/tools/e2e_go_test.sh b/tools/e2e_go_test.sh
index bc4964ffb12..c519b5589df 100755
--- a/tools/e2e_go_test.sh
+++ b/tools/e2e_go_test.sh
@@ -1,4 +1,25 @@
 #!/bin/bash
+
 source build.env
-echo "running tests for " "$@"
-go test -v "$@" -alsologtostderr -count=1
\ No newline at end of file
+
+echo "running tests for $PACKAGES"
+
+if [[ -z "$PACKAGES" ]]; then
+	echo "ERROR: PACKAGES is empty"
+	exit 1
+fi
+
+GOTESTSUM_ARGS=(
+	--format github-actions
+	--rerun-fails=3
+	--rerun-fails-max-failures=10
+	--rerun-fails-run-root-test
+	--format-hide-empty-pkg
+	--hide-summary=skipped
+)
+
+if [[ -n "$JUNIT_OUTPUT" ]]; then
+	GOTESTSUM_ARGS+=("--junitfile" "$JUNIT_OUTPUT")
+fi
+
+go tool gotestsum "${GOTESTSUM_ARGS[@]}" --packages "$PACKAGES" -- -v -count=1 "$@" -args -alsologtostderr