From b5eb4e215443e9eccf90fa1229e173586c5a9452 Mon Sep 17 00:00:00 2001
From: Mohamed Hamza <mhamza@fastmail.com>
Date: Tue, 20 Jan 2026 14:20:33 -0500
Subject: [PATCH 01/11] switch end-to-end tests to gotestsum

Signed-off-by: Mohamed Hamza <mhamza@fastmail.com>
---
 .github/workflows/cluster_endtoend_12.yml     |  14 +-
 .github/workflows/cluster_endtoend_13.yml     |  14 +-
 .github/workflows/cluster_endtoend_15.yml     |  14 +-
 .github/workflows/cluster_endtoend_18.yml     |  14 +-
 .github/workflows/cluster_endtoend_21.yml     |  14 +-
 .../cluster_endtoend_backup_pitr.yml          |  14 +-
 ...luster_endtoend_backup_pitr_mysqlshell.yml |  14 +-
 ...luster_endtoend_backup_pitr_xtrabackup.yml |  14 +-
 ...ter_endtoend_ers_prs_newfeatures_heavy.yml |  14 +-
 .../workflows/cluster_endtoend_mysql84.yml    |  14 +-
 .../cluster_endtoend_mysql_server_vault.yml   |  14 +-
 .../cluster_endtoend_onlineddl_revert.yml     |  14 +-
 .../cluster_endtoend_onlineddl_scheduler.yml  |  14 +-
 .../cluster_endtoend_onlineddl_vrepl.yml      |  14 +-
 ...luster_endtoend_onlineddl_vrepl_stress.yml |  14 +-
 ..._endtoend_onlineddl_vrepl_stress_suite.yml |  14 +-
 ...cluster_endtoend_onlineddl_vrepl_suite.yml |  14 +-
 .../cluster_endtoend_schemadiff_vrepl.yml     |  14 +-
 .../cluster_endtoend_tabletmanager_consul.yml |  14 +-
 ...cluster_endtoend_tabletmanager_tablegc.yml |  14 +-
 ..._endtoend_tabletmanager_throttler_topo.yml |  14 +-
 ...cluster_endtoend_topo_connection_cache.yml |  14 +-
 ...dtoend_vreplication_across_db_versions.yml |  14 +-
 .../cluster_endtoend_vreplication_basic.yml   |  14 +-
 ...luster_endtoend_vreplication_cellalias.yml |  14 +-
 ...er_endtoend_vreplication_copy_parallel.yml |  14 +-
 ...dtoend_vreplication_foreign_key_stress.yml |  14 +-
 ...endtoend_vreplication_mariadb_to_mysql.yml |  14 +-
 .../cluster_endtoend_vreplication_migrate.yml |  14 +-
 ...ter_endtoend_vreplication_multi_tenant.yml |  14 +-
 ...ion_partial_movetables_and_materialize.yml |  14 +-
 .../cluster_endtoend_vreplication_v2.yml      |  14 +-
 .../cluster_endtoend_vreplication_vdiff2.yml  |  14 +-
 ...replication_vtctldclient_movetables_tz.yml |  14 +-
 .../workflows/cluster_endtoend_vstream.yml    |  14 +-
 .../workflows/cluster_endtoend_vtbackup.yml   |  14 +-
 ..._vtctlbackup_sharded_clustertest_heavy.yml |  14 +-
 .../cluster_endtoend_vtgate_concurrentdml.yml |  14 +-
 ...ster_endtoend_vtgate_foreignkey_stress.yml |  14 +-
 .../cluster_endtoend_vtgate_gen4.yml          |  14 +-
 .../cluster_endtoend_vtgate_general_heavy.yml |  14 +-
 .../cluster_endtoend_vtgate_godriver.yml      |  14 +-
 ...uster_endtoend_vtgate_partial_keyspace.yml |  14 +-
 .../cluster_endtoend_vtgate_plantests.yml     |  14 +-
 .../cluster_endtoend_vtgate_queries.yml       |  14 +-
 ...cluster_endtoend_vtgate_readafterwrite.yml |  14 +-
 .../cluster_endtoend_vtgate_reservedconn.yml  |  14 +-
 .../cluster_endtoend_vtgate_schema.yml        |  14 +-
 ...cluster_endtoend_vtgate_schema_tracker.yml |  14 +-
 ...dtoend_vtgate_tablet_healthcheck_cache.yml |  14 +-
 .../cluster_endtoend_vtgate_topo.yml          |  14 +-
 .../cluster_endtoend_vtgate_topo_consul.yml   |  14 +-
 .../cluster_endtoend_vtgate_topo_etcd.yml     |  14 +-
 .../cluster_endtoend_vtgate_transaction.yml   |  14 +-
 .../cluster_endtoend_vtgate_unsharded.yml     |  14 +-
 .../cluster_endtoend_vtgate_vindex_heavy.yml  |  14 +-
 .../cluster_endtoend_vtgate_vschema.yml       |  14 +-
 .github/workflows/cluster_endtoend_vtorc.yml  |  14 +-
 .../cluster_endtoend_vttablet_prscomplex.yml  |  14 +-
 .../workflows/cluster_endtoend_xb_backup.yml  |  14 +-
 .../cluster_endtoend_xb_recovery.yml          |  14 +-
 test.go                                       | 131 ++++++--------
 test/README.md                                |   1 -
 test/config.json                              | 171 ------------------
 test/config_partial_keyspace.json             |  16 --
 test/templates/cluster_endtoend_test.tpl      |  13 +-
 .../cluster_endtoend_test_docker.tpl          |   7 +
 tools/e2e_go_test.sh                          |  18 +-
 68 files changed, 204 insertions(+), 1007 deletions(-)

diff --git a/.github/workflows/cluster_endtoend_12.yml b/.github/workflows/cluster_endtoend_12.yml
index 78b2caf04b2..b0dd92be101 100644
--- a/.github/workflows/cluster_endtoend_12.yml
+++ b/.github/workflows/cluster_endtoend_12.yml
@@ -100,9 +100,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -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 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()
@@ -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_13.yml b/.github/workflows/cluster_endtoend_13.yml
index 0bd3342e4d6..8a9a9991c88 100644
--- a/.github/workflows/cluster_endtoend_13.yml
+++ b/.github/workflows/cluster_endtoend_13.yml
@@ -100,9 +100,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -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 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()
@@ -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_15.yml b/.github/workflows/cluster_endtoend_15.yml
index 53f78290934..c391471bbea 100644
--- a/.github/workflows/cluster_endtoend_15.yml
+++ b/.github/workflows/cluster_endtoend_15.yml
@@ -100,9 +100,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -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 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()
@@ -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_18.yml b/.github/workflows/cluster_endtoend_18.yml
index 83ef489f1ba..5fbfa260d93 100644
--- a/.github/workflows/cluster_endtoend_18.yml
+++ b/.github/workflows/cluster_endtoend_18.yml
@@ -100,9 +100,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # HEAD
-
     - name: Installing zookeeper and consul
       if: steps.changes.outputs.end_to_end == 'true'
       run: |
@@ -133,8 +130,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()
@@ -142,15 +138,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 f5acc5aad8d..5cc9128ac27 100644
--- a/.github/workflows/cluster_endtoend_21.yml
+++ b/.github/workflows/cluster_endtoend_21.yml
@@ -100,9 +100,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # HEAD
-
     - name: Install Minio
       run: |
         wget https://dl.min.io/server/minio/release/linux-amd64/minio
@@ -134,8 +131,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()
@@ -143,15 +139,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 5912fd9f311..806bc1894d8 100644
--- a/.github/workflows/cluster_endtoend_backup_pitr.yml
+++ b/.github/workflows/cluster_endtoend_backup_pitr.yml
@@ -100,9 +100,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -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 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()
@@ -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_backup_pitr_mysqlshell.yml b/.github/workflows/cluster_endtoend_backup_pitr_mysqlshell.yml
index 50dbb1f8f25..784cccd3e7c 100644
--- a/.github/workflows/cluster_endtoend_backup_pitr_mysqlshell.yml
+++ b/.github/workflows/cluster_endtoend_backup_pitr_mysqlshell.yml
@@ -100,9 +100,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -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 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()
@@ -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_backup_pitr_xtrabackup.yml b/.github/workflows/cluster_endtoend_backup_pitr_xtrabackup.yml
index 1580ffa7715..e7fe6184ac2 100644
--- a/.github/workflows/cluster_endtoend_backup_pitr_xtrabackup.yml
+++ b/.github/workflows/cluster_endtoend_backup_pitr_xtrabackup.yml
@@ -109,9 +109,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -137,8 +134,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()
@@ -146,15 +142,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 0c820b107aa..d7e2e456a38 100644
--- a/.github/workflows/cluster_endtoend_ers_prs_newfeatures_heavy.yml
+++ b/.github/workflows/cluster_endtoend_ers_prs_newfeatures_heavy.yml
@@ -100,9 +100,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -146,8 +143,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()
@@ -155,15 +151,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 a0bbccec94b..8279b6ff24b 100644
--- a/.github/workflows/cluster_endtoend_mysql84.yml
+++ b/.github/workflows/cluster_endtoend_mysql84.yml
@@ -100,9 +100,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -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 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()
@@ -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_mysql_server_vault.yml b/.github/workflows/cluster_endtoend_mysql_server_vault.yml
index a3df3e098a2..3f5841d9f99 100644
--- a/.github/workflows/cluster_endtoend_mysql_server_vault.yml
+++ b/.github/workflows/cluster_endtoend_mysql_server_vault.yml
@@ -100,9 +100,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # HEAD
-
     - name: Installing zookeeper and consul
       if: steps.changes.outputs.end_to_end == 'true'
       run: |
@@ -133,8 +130,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()
@@ -142,15 +138,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 8dc7aa73304..42e06d34b59 100644
--- a/.github/workflows/cluster_endtoend_onlineddl_revert.yml
+++ b/.github/workflows/cluster_endtoend_onlineddl_revert.yml
@@ -101,9 +101,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -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 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()
@@ -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_onlineddl_scheduler.yml b/.github/workflows/cluster_endtoend_onlineddl_scheduler.yml
index 2dd05d613fe..cda8b7ee5d0 100644
--- a/.github/workflows/cluster_endtoend_onlineddl_scheduler.yml
+++ b/.github/workflows/cluster_endtoend_onlineddl_scheduler.yml
@@ -101,9 +101,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -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 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()
@@ -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_onlineddl_vrepl.yml b/.github/workflows/cluster_endtoend_onlineddl_vrepl.yml
index c624b278537..a9ca87bb441 100644
--- a/.github/workflows/cluster_endtoend_onlineddl_vrepl.yml
+++ b/.github/workflows/cluster_endtoend_onlineddl_vrepl.yml
@@ -101,9 +101,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -137,8 +134,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()
@@ -146,15 +142,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 f72118d43bd..96f413f440f 100644
--- a/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress.yml
+++ b/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress.yml
@@ -101,9 +101,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -137,8 +134,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()
@@ -146,15 +142,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 33bfb54fcea..3668dfbff58 100644
--- a/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress_suite.yml
+++ b/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress_suite.yml
@@ -101,9 +101,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -137,8 +134,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()
@@ -146,15 +142,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 fca378d87ec..0e1c04c8658 100644
--- a/.github/workflows/cluster_endtoend_onlineddl_vrepl_suite.yml
+++ b/.github/workflows/cluster_endtoend_onlineddl_vrepl_suite.yml
@@ -101,9 +101,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -137,8 +134,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()
@@ -146,15 +142,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 7d653e80821..932d457fda3 100644
--- a/.github/workflows/cluster_endtoend_schemadiff_vrepl.yml
+++ b/.github/workflows/cluster_endtoend_schemadiff_vrepl.yml
@@ -101,9 +101,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -137,8 +134,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()
@@ -146,15 +142,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 7a9d7d9b35f..aa9f8dd7c08 100644
--- a/.github/workflows/cluster_endtoend_tabletmanager_consul.yml
+++ b/.github/workflows/cluster_endtoend_tabletmanager_consul.yml
@@ -100,9 +100,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # HEAD
-
     - name: Installing zookeeper and consul
       if: steps.changes.outputs.end_to_end == 'true'
       run: |
@@ -133,8 +130,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()
@@ -142,15 +138,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 e9050dde290..1c804aed0e7 100644
--- a/.github/workflows/cluster_endtoend_tabletmanager_tablegc.yml
+++ b/.github/workflows/cluster_endtoend_tabletmanager_tablegc.yml
@@ -100,9 +100,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -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_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()
@@ -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_throttler_topo.yml b/.github/workflows/cluster_endtoend_tabletmanager_throttler_topo.yml
index aa9e3919b7e..54e9fb52701 100644
--- a/.github/workflows/cluster_endtoend_tabletmanager_throttler_topo.yml
+++ b/.github/workflows/cluster_endtoend_tabletmanager_throttler_topo.yml
@@ -100,9 +100,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -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_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()
@@ -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_topo_connection_cache.yml b/.github/workflows/cluster_endtoend_topo_connection_cache.yml
index 56dcf4cc3de..5b16a0cf4c3 100644
--- a/.github/workflows/cluster_endtoend_topo_connection_cache.yml
+++ b/.github/workflows/cluster_endtoend_topo_connection_cache.yml
@@ -100,9 +100,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -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 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()
@@ -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_vreplication_across_db_versions.yml b/.github/workflows/cluster_endtoend_vreplication_across_db_versions.yml
index 685c39eecad..459b66dafe0 100644
--- a/.github/workflows/cluster_endtoend_vreplication_across_db_versions.yml
+++ b/.github/workflows/cluster_endtoend_vreplication_across_db_versions.yml
@@ -100,9 +100,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -154,8 +151,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()
@@ -163,15 +159,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 96806f4601f..1a5024f07f0 100644
--- a/.github/workflows/cluster_endtoend_vreplication_basic.yml
+++ b/.github/workflows/cluster_endtoend_vreplication_basic.yml
@@ -100,9 +100,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -154,8 +151,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()
@@ -163,15 +159,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 562ec0ce7cf..1bcf8b8cc5c 100644
--- a/.github/workflows/cluster_endtoend_vreplication_cellalias.yml
+++ b/.github/workflows/cluster_endtoend_vreplication_cellalias.yml
@@ -100,9 +100,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -154,8 +151,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()
@@ -163,15 +159,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 a9bb16a2424..db65059a8f1 100644
--- a/.github/workflows/cluster_endtoend_vreplication_copy_parallel.yml
+++ b/.github/workflows/cluster_endtoend_vreplication_copy_parallel.yml
@@ -100,9 +100,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -154,8 +151,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()
@@ -163,15 +159,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 adc97254621..2b8258e4137 100644
--- a/.github/workflows/cluster_endtoend_vreplication_foreign_key_stress.yml
+++ b/.github/workflows/cluster_endtoend_vreplication_foreign_key_stress.yml
@@ -100,9 +100,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -154,8 +151,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()
@@ -163,15 +159,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 b93233f288f..c518d12b593 100644
--- a/.github/workflows/cluster_endtoend_vreplication_mariadb_to_mysql.yml
+++ b/.github/workflows/cluster_endtoend_vreplication_mariadb_to_mysql.yml
@@ -100,9 +100,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -154,8 +151,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()
@@ -163,15 +159,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 04f78f66093..84574d453d2 100644
--- a/.github/workflows/cluster_endtoend_vreplication_migrate.yml
+++ b/.github/workflows/cluster_endtoend_vreplication_migrate.yml
@@ -100,9 +100,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -154,8 +151,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()
@@ -163,15 +159,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 3ebd25bda9a..9ace1ba4ff0 100644
--- a/.github/workflows/cluster_endtoend_vreplication_multi_tenant.yml
+++ b/.github/workflows/cluster_endtoend_vreplication_multi_tenant.yml
@@ -100,9 +100,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -154,8 +151,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()
@@ -163,15 +159,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 2789a8c6a92..fe965178d21 100644
--- a/.github/workflows/cluster_endtoend_vreplication_partial_movetables_and_materialize.yml
+++ b/.github/workflows/cluster_endtoend_vreplication_partial_movetables_and_materialize.yml
@@ -100,9 +100,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -154,8 +151,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()
@@ -163,15 +159,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 df8c209dd4a..31bf05ea076 100644
--- a/.github/workflows/cluster_endtoend_vreplication_v2.yml
+++ b/.github/workflows/cluster_endtoend_vreplication_v2.yml
@@ -100,9 +100,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -154,8 +151,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()
@@ -163,15 +159,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 6284a22252a..e6ad3613e60 100644
--- a/.github/workflows/cluster_endtoend_vreplication_vdiff2.yml
+++ b/.github/workflows/cluster_endtoend_vreplication_vdiff2.yml
@@ -100,9 +100,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -154,8 +151,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()
@@ -163,15 +159,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 7a88a7c8a8f..72f123e9e1b 100644
--- a/.github/workflows/cluster_endtoend_vreplication_vtctldclient_movetables_tz.yml
+++ b/.github/workflows/cluster_endtoend_vreplication_vtctldclient_movetables_tz.yml
@@ -100,9 +100,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -154,8 +151,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()
@@ -163,15 +159,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 7b7066b33fb..509c47bee77 100644
--- a/.github/workflows/cluster_endtoend_vstream.yml
+++ b/.github/workflows/cluster_endtoend_vstream.yml
@@ -100,9 +100,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -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 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()
@@ -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_vtbackup.yml b/.github/workflows/cluster_endtoend_vtbackup.yml
index 7eeab6b2908..9757b3ab723 100644
--- a/.github/workflows/cluster_endtoend_vtbackup.yml
+++ b/.github/workflows/cluster_endtoend_vtbackup.yml
@@ -100,9 +100,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -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 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()
@@ -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_vtctlbackup_sharded_clustertest_heavy.yml b/.github/workflows/cluster_endtoend_vtctlbackup_sharded_clustertest_heavy.yml
index 3ad94ef6622..90e55fafdfe 100644
--- a/.github/workflows/cluster_endtoend_vtctlbackup_sharded_clustertest_heavy.yml
+++ b/.github/workflows/cluster_endtoend_vtctlbackup_sharded_clustertest_heavy.yml
@@ -100,9 +100,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -146,8 +143,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()
@@ -155,15 +151,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 772a654c2a9..054e3e46995 100644
--- a/.github/workflows/cluster_endtoend_vtgate_concurrentdml.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_concurrentdml.yml
@@ -100,9 +100,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -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_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()
@@ -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_foreignkey_stress.yml b/.github/workflows/cluster_endtoend_vtgate_foreignkey_stress.yml
index 18fbc338070..1a1165578f1 100644
--- a/.github/workflows/cluster_endtoend_vtgate_foreignkey_stress.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_foreignkey_stress.yml
@@ -100,9 +100,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -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_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()
@@ -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_gen4.yml b/.github/workflows/cluster_endtoend_vtgate_gen4.yml
index 8cf03ede8a5..ee478d4b72e 100644
--- a/.github/workflows/cluster_endtoend_vtgate_gen4.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_gen4.yml
@@ -100,9 +100,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -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_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()
@@ -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_general_heavy.yml b/.github/workflows/cluster_endtoend_vtgate_general_heavy.yml
index 640a9146a32..7c591a67f89 100644
--- a/.github/workflows/cluster_endtoend_vtgate_general_heavy.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_general_heavy.yml
@@ -100,9 +100,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -146,8 +143,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()
@@ -155,15 +151,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 c871bf57448..dff122ffe42 100644
--- a/.github/workflows/cluster_endtoend_vtgate_godriver.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_godriver.yml
@@ -100,9 +100,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -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_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()
@@ -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_partial_keyspace.yml b/.github/workflows/cluster_endtoend_vtgate_partial_keyspace.yml
index 538d8133941..1dd8988bc9f 100644
--- a/.github/workflows/cluster_endtoend_vtgate_partial_keyspace.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_partial_keyspace.yml
@@ -100,9 +100,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -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_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()
@@ -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_plantests.yml b/.github/workflows/cluster_endtoend_vtgate_plantests.yml
index 8903597accf..39f6aae2d0f 100644
--- a/.github/workflows/cluster_endtoend_vtgate_plantests.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_plantests.yml
@@ -100,9 +100,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -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_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()
@@ -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_queries.yml b/.github/workflows/cluster_endtoend_vtgate_queries.yml
index b721378099e..4e605006ec3 100644
--- a/.github/workflows/cluster_endtoend_vtgate_queries.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_queries.yml
@@ -100,9 +100,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -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_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()
@@ -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_readafterwrite.yml b/.github/workflows/cluster_endtoend_vtgate_readafterwrite.yml
index f41291c8bdc..831ca35cb58 100644
--- a/.github/workflows/cluster_endtoend_vtgate_readafterwrite.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_readafterwrite.yml
@@ -100,9 +100,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -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_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()
@@ -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_reservedconn.yml b/.github/workflows/cluster_endtoend_vtgate_reservedconn.yml
index 8189707cf39..f30b8ef074f 100644
--- a/.github/workflows/cluster_endtoend_vtgate_reservedconn.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_reservedconn.yml
@@ -100,9 +100,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -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_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()
@@ -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_schema.yml b/.github/workflows/cluster_endtoend_vtgate_schema.yml
index 7bed0ab0116..a9e8c58af8a 100644
--- a/.github/workflows/cluster_endtoend_vtgate_schema.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_schema.yml
@@ -100,9 +100,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -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_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()
@@ -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_schema_tracker.yml b/.github/workflows/cluster_endtoend_vtgate_schema_tracker.yml
index b61cb2e6d0b..de8c0771ca7 100644
--- a/.github/workflows/cluster_endtoend_vtgate_schema_tracker.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_schema_tracker.yml
@@ -100,9 +100,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -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_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()
@@ -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_tablet_healthcheck_cache.yml b/.github/workflows/cluster_endtoend_vtgate_tablet_healthcheck_cache.yml
index 0360f9e6718..c424296a612 100644
--- a/.github/workflows/cluster_endtoend_vtgate_tablet_healthcheck_cache.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_tablet_healthcheck_cache.yml
@@ -100,9 +100,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -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_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()
@@ -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.yml b/.github/workflows/cluster_endtoend_vtgate_topo.yml
index 285140886f9..440a3ac7bb4 100644
--- a/.github/workflows/cluster_endtoend_vtgate_topo.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_topo.yml
@@ -100,9 +100,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -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 | 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()
@@ -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_consul.yml b/.github/workflows/cluster_endtoend_vtgate_topo_consul.yml
index 72b5d323291..ed40a196bae 100644
--- a/.github/workflows/cluster_endtoend_vtgate_topo_consul.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_topo_consul.yml
@@ -100,9 +100,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # HEAD
-
     - name: Installing zookeeper and consul
       if: steps.changes.outputs.end_to_end == 'true'
       run: |
@@ -133,8 +130,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()
@@ -142,15 +138,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 1d54ac0711b..087fccdd996 100644
--- a/.github/workflows/cluster_endtoend_vtgate_topo_etcd.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_topo_etcd.yml
@@ -100,9 +100,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -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_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()
@@ -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_transaction.yml b/.github/workflows/cluster_endtoend_vtgate_transaction.yml
index 11b2da04af0..d92609b47c5 100644
--- a/.github/workflows/cluster_endtoend_vtgate_transaction.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_transaction.yml
@@ -100,9 +100,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -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_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()
@@ -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_unsharded.yml b/.github/workflows/cluster_endtoend_vtgate_unsharded.yml
index a02fbe6fcc1..0d48eedf80c 100644
--- a/.github/workflows/cluster_endtoend_vtgate_unsharded.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_unsharded.yml
@@ -100,9 +100,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -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_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()
@@ -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_vindex_heavy.yml b/.github/workflows/cluster_endtoend_vtgate_vindex_heavy.yml
index 9e6227400d8..9ceb5e04b0a 100644
--- a/.github/workflows/cluster_endtoend_vtgate_vindex_heavy.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_vindex_heavy.yml
@@ -100,9 +100,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -146,8 +143,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()
@@ -155,15 +151,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 d76a7e4f817..4294e712ccc 100644
--- a/.github/workflows/cluster_endtoend_vtgate_vschema.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_vschema.yml
@@ -100,9 +100,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -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_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()
@@ -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_vtorc.yml b/.github/workflows/cluster_endtoend_vtorc.yml
index 4b7b4112e93..6704b65f8fe 100644
--- a/.github/workflows/cluster_endtoend_vtorc.yml
+++ b/.github/workflows/cluster_endtoend_vtorc.yml
@@ -109,9 +109,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -137,8 +134,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()
@@ -146,15 +142,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 70f3bb52087..9b2ee26b6d3 100644
--- a/.github/workflows/cluster_endtoend_vttablet_prscomplex.yml
+++ b/.github/workflows/cluster_endtoend_vttablet_prscomplex.yml
@@ -100,9 +100,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -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 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()
@@ -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_xb_backup.yml b/.github/workflows/cluster_endtoend_xb_backup.yml
index c52334e9b3c..24f3fb56cbe 100644
--- a/.github/workflows/cluster_endtoend_xb_backup.yml
+++ b/.github/workflows/cluster_endtoend_xb_backup.yml
@@ -109,9 +109,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -137,8 +134,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()
@@ -146,15 +142,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 fde96b49c00..42b445d2af4 100644
--- a/.github/workflows/cluster_endtoend_xb_recovery.yml
+++ b/.github/workflows/cluster_endtoend_xb_recovery.yml
@@ -109,9 +109,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # 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: |
@@ -137,8 +134,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()
@@ -146,15 +142,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.go b/test.go
index dd51aee26f4..3223d70c99f 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", "49", "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")
@@ -133,10 +132,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 +171,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") {
@@ -222,6 +223,7 @@ func (t *Test) run(dir, dataDir string) ([]byte, error) {
 		// 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,
 		"VTROOT":                                "/vt/src/vitess.io/vitess",
 		"VTDATAROOT":                            dataDir,
 		"VTPORTSTART":                           strconv.FormatInt(int64(getPortStart(100)), 10),
@@ -338,6 +340,11 @@ func main() {
 	if err := os.MkdirAll(outDir, os.FileMode(0755)); err != nil {
 		log.Fatalf("Can't create output directory: %v", err)
 	}
+
+	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, 0644)
 	if err != nil {
 		log.Fatalf("Can't create log file: %v", err)
@@ -491,89 +498,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..9b3ea6b547c 100644
--- a/test/README.md
+++ b/test/README.md
@@ -30,7 +30,6 @@ Each test is of the form:
 			"Command": [],
 			"Manual": false,
 			"Shard": 17,
-			"RetryMax": 0,
 			"Tags": []
 		},
 ```
diff --git a/test/config.json b/test/config.json
index 25b33ec5f1e..12200a11165 100644
--- a/test/config.json
+++ b/test/config.json
@@ -9,7 +9,6 @@
 			],
 			"Manual": false,
 			"Shard": "java",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"client_test": {
@@ -20,7 +19,6 @@
 			],
 			"Manual": false,
 			"Shard": "java",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"e2e": {
@@ -31,7 +29,6 @@
 			],
 			"Manual": false,
 			"Shard": "",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"e2e_race": {
@@ -43,7 +40,6 @@
 			],
 			"Manual": false,
 			"Shard": "",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"unit": {
@@ -54,7 +50,6 @@
 			],
 			"Manual": false,
 			"Shard": "",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"unit_race": {
@@ -66,7 +61,6 @@
 			],
 			"Manual": false,
 			"Shard": "5",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"local_example": {
@@ -77,7 +71,6 @@
 			],
 			"Manual": false,
 			"Shard": "",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"region_example": {
@@ -88,7 +81,6 @@
 			],
 			"Manual": false,
 			"Shard": "",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"backup_pitr": {
@@ -97,7 +89,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "backup_pitr",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"backup_pitr_xtrabackup": {
@@ -106,7 +97,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "backup_pitr_xtrabackup",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"backup_pitr_mysqlshell": {
@@ -115,7 +105,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "backup_pitr_mysqlshell",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"backup": {
@@ -124,7 +113,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtctlbackup_sharded_clustertest_heavy",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"backup_mysqlctld": {
@@ -133,7 +121,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "21",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"backup_s3": {
@@ -142,7 +129,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "21",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"backup_only": {
@@ -151,7 +137,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtbackup",
-			"RetryMax": 1,
 			"Tags": ["upgrade_downgrade_backups"]
 		},
 		"backup_xtrabackup": {
@@ -160,7 +145,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "xb_backup",
-			"RetryMax": 2,
 			"Tags": []
 		},
 		"backup_xtrabackup_xbstream": {
@@ -169,7 +153,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "xb_backup",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"backup_xtrabackup_xbstream_lz4": {
@@ -178,7 +161,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "xb_backup",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"cellalias": {
@@ -187,7 +169,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "13",
-			"RetryMax": 3,
 			"Tags": []
 		},
 		"prepare_statement": {
@@ -196,7 +177,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "12",
-			"RetryMax": 1,
 			"Tags": ["upgrade_downgrade_query_serving_queries"]
 		},
 		"mysql_server": {
@@ -205,7 +185,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "mysql_server_vault",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"messaging": {
@@ -214,7 +193,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "12",
-			"RetryMax": 3,
 			"Tags": []
 		},
 		"clustertest": {
@@ -223,7 +201,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtctlbackup_sharded_clustertest_heavy",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"encrypted_replication": {
@@ -232,7 +209,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "12",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"encrypted_transport": {
@@ -241,7 +217,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "12",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"unmanaged_ssl_check": {
@@ -250,7 +225,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "12",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"keyspace": {
@@ -259,7 +233,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "12",
-			"RetryMax": 1,
 			"Tags": [
 				"site_test"
 			]
@@ -270,7 +243,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "12",
-			"RetryMax": 1,
 			"Tags": [
 				"site_test"
 			]
@@ -281,7 +253,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "12",
-			"RetryMax": 1,
 			"Tags": [
 				"site_test"
 			]
@@ -292,7 +263,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "onlineddl_vrepl",
-			"RetryMax": 2,
 			"Tags": []
 		},
 		"onlineddl_vrepl_stress": {
@@ -301,7 +271,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "onlineddl_vrepl_stress",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"onlineddl_vrepl_suite": {
@@ -310,7 +279,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "onlineddl_vrepl_suite",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"onlineddl_vrepl_stress_suite": {
@@ -319,7 +287,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "onlineddl_vrepl_stress_suite",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"onlineddl_revert": {
@@ -328,7 +295,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "onlineddl_revert",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"onlineddl_scheduler": {
@@ -337,7 +303,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "onlineddl_scheduler",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"onlineddl_flow": {
@@ -346,7 +311,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "onlineddl_flow",
-			"RetryMax": 1,
 			"Tags": ["upgrade_downgrade_onlineddl_flow"]
 		},
 		"schemadiff_vrepl": {
@@ -355,7 +319,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "schemadiff_vrepl",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"recovery": {
@@ -364,7 +327,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtctlbackup_sharded_clustertest_heavy",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"emergencyreparent": {
@@ -373,7 +335,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "ers_prs_newfeatures_heavy",
-			"RetryMax": 1,
 			"Tags": ["upgrade_downgrade_reparent"]
 		},
 		"plannedreparent": {
@@ -382,7 +343,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "ers_prs_newfeatures_heavy",
-			"RetryMax": 1,
 			"Tags": ["upgrade_downgrade_reparent"]
 		},
 		"newfeatures": {
@@ -391,7 +351,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "ers_prs_newfeatures_heavy",
-			"RetryMax": 1,
 			"Tags": [""]
 		},
 		"sharded": {
@@ -400,7 +359,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtctlbackup_sharded_clustertest_heavy",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"tabletgateway_buffer_reparent": {
@@ -409,7 +367,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "13",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"tabletgateway_buffer_reshard": {
@@ -418,7 +375,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "13",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"tabletgateway": {
@@ -427,7 +383,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "15",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtctldclient": {
@@ -436,7 +391,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "15",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"tabletmanager": {
@@ -445,7 +399,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "18",
-			"RetryMax": 1,
 			"Tags": [
 				"site_test"
 			]
@@ -456,7 +409,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "18",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"tabletmanager_replication_manager": {
@@ -465,7 +417,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "18",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"tabletmanager_consul": {
@@ -476,7 +427,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "tabletmanager_consul",
-			"RetryMax": 1,
 			"Tags": [
 				"site_test"
 			]
@@ -487,7 +437,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "tabletmanager_throttler_topo",
-			"RetryMax": 1,
 			"Tags": [
 				"site_test"
 			]
@@ -498,7 +447,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "tabletmanager_tablegc",
-			"RetryMax": 2,
 			"Tags": [
 				"site_test"
 			]
@@ -511,7 +459,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "docker_cluster",
-			"RetryMax": 1,
 			"Tags": [
 				"site_test"
 			]
@@ -522,7 +469,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "28",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate": {
@@ -531,7 +477,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_general_heavy",
-			"RetryMax": 2,
 			"Tags": []
 		},
 		"vtgate_tablet_healthcheck": {
@@ -540,7 +485,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_general_heavy",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_tabletbalancer": {
@@ -549,7 +493,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_general_heavy",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_connectiondrain": {
@@ -558,7 +501,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_general_heavy",
-			"RetryMax": 2,
 			"Tags": []
 		},
 		"vtgate_queries_derived": {
@@ -567,7 +509,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_queries",
-			"RetryMax": 1,
 			"Tags": ["upgrade_downgrade_query_serving_queries"]
 		},
 		"vtgate_queries_aggregation": {
@@ -576,7 +517,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_queries",
-			"RetryMax": 2,
 			"Tags": ["upgrade_downgrade_query_serving_queries"]
 		},
 		"vtgate_queries_foundrows": {
@@ -585,7 +525,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_queries",
-			"RetryMax": 2,
 			"Tags": ["upgrade_downgrade_query_serving_queries"]
 		},
 		"vtgate_queries_informationschema": {
@@ -594,7 +533,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_queries",
-			"RetryMax": 2,
 			"Tags": ["upgrade_downgrade_query_serving_queries"]
 		},
 		"vtgate_queries_misc": {
@@ -603,7 +541,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_queries",
-			"RetryMax": 1,
 			"Tags": ["upgrade_downgrade_query_serving_queries"]
 		},
 		"vtgate_queries_multi_query": {
@@ -612,7 +549,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_queries",
-			"RetryMax": 1,
 			"Tags": ["upgrade_downgrade_query_serving_queries"]
 		},
 		"vtgate_queries_timeout": {
@@ -621,7 +557,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_queries",
-			"RetryMax": 1,
 			"Tags": ["upgrade_downgrade_query_serving_queries"]
 		},
 		"vtgate_queries_normalize": {
@@ -630,7 +565,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_queries",
-			"RetryMax": 2,
 			"Tags": ["upgrade_downgrade_query_serving_queries"]
 		},
 		"vtgate_queries_no_scatter": {
@@ -639,7 +573,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_queries",
-			"RetryMax": 1,
 			"Tags": ["upgrade_downgrade_query_serving_queries"]
 		},
 		"vtgate_queries_orderby": {
@@ -648,7 +581,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_queries",
-			"RetryMax": 2,
 			"Tags": ["upgrade_downgrade_query_serving_queries"]
 		},
 		"vtgate_queries_tpch": {
@@ -657,7 +589,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_queries",
-			"RetryMax": 2,
 			"Tags": ["upgrade_downgrade_query_serving_queries_2"]
 		},
 		"vtgate_queries_subquery": {
@@ -666,7 +597,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_queries",
-			"RetryMax": 2,
 			"Tags": ["upgrade_downgrade_query_serving_queries_2"]
 		},
 		"vtgate_queries_union": {
@@ -675,7 +605,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_queries",
-			"RetryMax": 2,
 			"Tags": ["upgrade_downgrade_query_serving_queries_2"]
 		},
 		"vtgate_queries_insert": {
@@ -684,7 +613,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_queries",
-			"RetryMax": 2,
 			"Tags": ["upgrade_downgrade_query_serving_queries_2"]
 		},
 		"vtgate_queries_vexplain": {
@@ -693,7 +621,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_queries",
-			"RetryMax": 2,
 			"Tags": ["upgrade_downgrade_query_serving_queries_2"]
 		},
 		"vtgate_queries_reference": {
@@ -702,7 +629,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_queries",
-			"RetryMax": 1,
 			"Tags": ["upgrade_downgrade_query_serving_queries_2"]
 		},
 		"vtgate_queries_random": {
@@ -711,7 +637,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_queries",
-			"RetryMax": 1,
 			"Tags": ["upgrade_downgrade_query_serving_queries_2"]
 		},
 		"vtgate_queries_lookup_queries": {
@@ -720,7 +645,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_queries",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_queries_orderby_without_schematracker": {
@@ -729,7 +653,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_queries",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"mysql_vs_vitess": {
@@ -738,7 +661,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_queries",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_kill": {
@@ -747,7 +669,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_queries",
-			"RetryMax": 1,
 			"Tags": ["upgrade_downgrade_query_serving_queries_2"]
 		},
 		"vtgate_concurrentdml": {
@@ -756,7 +677,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_concurrentdml",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_schema": {
@@ -765,7 +685,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_schema",
-			"RetryMax": 1,
 			"Tags": ["upgrade_downgrade_query_serving_schema"]
 		},
 		"vtgate_schematracker_loadkeyspace": {
@@ -774,7 +693,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_schema_tracker",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_schematracker_restarttablet": {
@@ -783,7 +701,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_schema_tracker",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_schematracker_sharded": {
@@ -792,7 +709,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_schema_tracker",
-			"RetryMax": 1,
 			"Tags": ["upgrade_downgrade_query_serving_schema"]
 		},
 		"vtgate_schematracker_sharded_prs": {
@@ -801,7 +717,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_schema_tracker",
-			"RetryMax": 1,
 			"Tags": ["upgrade_downgrade_query_serving_schema"]
 		},
 		"vtgate_schematracker_unsharded": {
@@ -810,7 +725,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_schema_tracker",
-			"RetryMax": 1,
 			"Tags": ["upgrade_downgrade_query_serving_schema"]
 		},
 		"vtgate_schematracker_viewsdisabled": {
@@ -819,7 +733,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_schema_tracker",
-			"RetryMax": 1,
 			"Tags": ["upgrade_downgrade_query_serving_schema"]
 		},
 		"vtgate_schematracker_multi_ks": {
@@ -828,7 +741,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_schema_tracker",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_mysql84": {
@@ -837,7 +749,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "mysql84",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_sequence": {
@@ -846,7 +757,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_general_heavy",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_setstatement": {
@@ -855,7 +765,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_reservedconn",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_reserved_conn1": {
@@ -864,7 +773,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_reservedconn",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_reserved_conn2": {
@@ -873,7 +781,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_reservedconn",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_reserved_conn3": {
@@ -882,7 +789,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_reservedconn",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_reserved_conn4": {
@@ -891,7 +797,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_reservedconn",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_tablet_healthcheck_cache": {
@@ -900,7 +805,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_tablet_healthcheck_cache",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_transaction": {
@@ -909,7 +813,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_transaction",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_transaction_restart": {
@@ -918,7 +821,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_transaction",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_transaction_rollback": {
@@ -927,7 +829,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_transaction",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_transaction_single": {
@@ -936,7 +837,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_transaction",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_transaction_twopc": {
@@ -945,7 +845,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_transaction",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_transaction_twopc_metric": {
@@ -954,7 +853,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_transaction",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_transaction_twopc_stress": {
@@ -963,7 +861,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_transaction",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_transaction_twopc_fuzz": {
@@ -972,7 +869,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_transaction",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_transaction_timeout": {
@@ -981,7 +877,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_transaction",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_transaction_partial_exec": {
@@ -990,7 +885,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_transaction",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_plantests": {
@@ -999,7 +893,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_plantests",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_unsharded": {
@@ -1008,7 +901,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_unsharded",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_vschema": {
@@ -1017,7 +909,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_vschema",
-			"RetryMax": 1,
 			"Tags": ["upgrade_downgrade_query_serving_schema"]
 		},
 		"vtgate_readafterwrite": {
@@ -1026,7 +917,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_readafterwrite",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_dbddlplugin": {
@@ -1035,7 +925,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_general_heavy",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_foreignkey": {
@@ -1044,7 +933,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_foreignkey_stress",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_foreignkey_routing": {
@@ -1053,7 +941,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_foreignkey_stress",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_foreignkey_stress": {
@@ -1062,7 +949,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_foreignkey_stress",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_gen4": {
@@ -1071,7 +957,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_gen4",
-			"RetryMax": 2,
 			"Tags": []
 		},
 		"vtgate_godriver": {
@@ -1080,7 +965,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_godriver",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_watchkeyspace": {
@@ -1089,7 +973,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_topo",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtgate_grpc_api": {
@@ -1098,7 +981,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_general_heavy",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"topo_zk2": {
@@ -1107,7 +989,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "docker_cluster",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"topo_consul": {
@@ -1116,7 +997,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_topo_consul",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"topo_etcd2": {
@@ -1125,7 +1005,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_topo_etcd",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"errs_as_warns": {
@@ -1134,7 +1013,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_general_heavy",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"consolidator": {
@@ -1143,7 +1021,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_general_heavy",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"prefixfanout": {
@@ -1152,7 +1029,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_vindex_heavy",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vindex_bindvars": {
@@ -1161,7 +1037,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_vindex_heavy",
-			"RetryMax": 2,
 			"Tags": []
 		},
 		"vindex_secondary": {
@@ -1170,7 +1045,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_vindex_heavy",
-			"RetryMax": 2,
 			"Tags": []
 		},
 		"vttest_sample": {
@@ -1179,7 +1053,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "docker_cluster",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtcombo_recreate": {
@@ -1188,7 +1061,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "docker_cluster",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"xb_recovery": {
@@ -1197,7 +1069,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "xb_recovery",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vreplication_materialize": {
@@ -1206,7 +1077,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vreplication_partial_movetables_and_materialize",
-			"RetryMax": 0,
 			"Tags": []
 		},
 		"vreplication_vtctldclient_materialize": {
@@ -1215,7 +1085,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vreplication_partial_movetables_and_materialize",
-			"RetryMax": 0,
 			"Tags": []
 		},
 		"vreplication_cellalias": {
@@ -1224,7 +1093,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vreplication_cellalias",
-			"RetryMax": 0,
 			"Tags": []
 		},
 		"vreplication_movetables_ignore_source_keyspace": {
@@ -1233,7 +1101,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vreplication_cellalias",
-			"RetryMax": 0,
 			"Tags": []
 		},
 		"vreplication_multi_tenant": {
@@ -1242,7 +1109,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vreplication_multi_tenant",
-			"RetryMax": 0,
 			"Tags": []
 		},
 		"vreplication_partial_movetables_basic": {
@@ -1251,7 +1117,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vreplication_partial_movetables_and_materialize",
-			"RetryMax": 0,
 			"Tags": []
 		},
 		"vdiff_multiple_movetables_test.go": {
@@ -1260,7 +1125,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vreplication_partial_movetables_and_materialize",
-			"RetryMax": 0,
 			"Tags": []
 		},
 		"vreplication_movetables_buffering": {
@@ -1269,7 +1133,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vreplication_cellalias",
-			"RetryMax": 0,
 			"Tags": []
 		},
 		"vreplication_onlineddl_vdiff": {
@@ -1278,7 +1141,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vreplication_cellalias",
-			"RetryMax": 2,
 			"Tags": []
 		},
 		"vreplication_vschema_load": {
@@ -1287,7 +1149,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vreplication_cellalias",
-			"RetryMax": 2,
 			"Tags": []
 		},
 		"sidecardb": {
@@ -1296,7 +1157,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "schemadiff_vrepl",
-			"RetryMax": 2,
 			"Tags": []
 		},
 		"vreplication_basic": {
@@ -1305,7 +1165,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vreplication_basic",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vreplication_copy_parallel": {
@@ -1314,7 +1173,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vreplication_copy_parallel",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vreplication_partial_movetables_sequences": {
@@ -1323,7 +1181,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vreplication_partial_movetables_and_materialize",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vreplication_sequence_reset_on_switch_traffic": {
@@ -1332,7 +1189,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vreplication_partial_movetables_and_materialize",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vstream_flush_binlog": {
@@ -1341,7 +1197,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vreplication_basic",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"multi_vstreams_keyspace_reshard": {
@@ -1350,7 +1205,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vstream",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vstream_failover": {
@@ -1359,7 +1213,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vstream",
-			"RetryMax": 3,
 			"Tags": []
 		},
 		"vstream_stoponreshard_true": {
@@ -1368,7 +1221,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vstream",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vstream_stoponreshard_false": {
@@ -1377,7 +1229,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vstream",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vstream_with_keyspaces_to_watch": {
@@ -1386,7 +1237,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vstream",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtop_example": {
@@ -1397,7 +1247,6 @@
 			],
 			"Manual": false,
 			"Shard": "",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtorc_primary_failure": {
@@ -1406,7 +1255,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtorc",
-			"RetryMax": 3,
 			"Tags": []
 		},
 		"vtorc_api": {
@@ -1415,7 +1263,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtorc",
-			"RetryMax": 3,
 			"Tags": []
 		},
 		"vtorc_general": {
@@ -1424,7 +1271,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtorc",
-			"RetryMax": 3,
 			"Tags": []
 		},
 		"vtorc_readtopologyinstance": {
@@ -1433,7 +1279,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtorc",
-			"RetryMax": 3,
 			"Tags": []
 		},
 		"vault": {
@@ -1442,7 +1287,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "mysql_server_vault",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vreplication_v2": {
@@ -1451,7 +1295,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vreplication_v2",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"global_routing": {
@@ -1460,7 +1303,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vreplication_v2",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vreplication_fk": {
@@ -1469,7 +1311,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vreplication_cellalias",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vreplication_foreign_key_stress": {
@@ -1478,7 +1319,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vreplication_foreign_key_stress",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vreplication_across_db_versions": {
@@ -1487,7 +1327,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vreplication_across_db_versions",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vreplication_mariadb_to_mysql": {
@@ -1496,7 +1335,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vreplication_mariadb_to_mysql",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vreplication_migrate": {
@@ -1505,7 +1343,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vreplication_migrate",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vdiff2": {
@@ -1514,7 +1351,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vreplication_vdiff2",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vreplication_vtctldclient_cli": {
@@ -1523,7 +1359,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vreplication_vtctldclient_movetables_tz",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vreplication_movetables_tz": {
@@ -1532,7 +1367,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vreplication_vtctldclient_movetables_tz",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"loopkup_index": {
@@ -1541,7 +1375,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vreplication_vtctldclient_movetables_tz",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"vtadmin": {
@@ -1550,7 +1383,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "15",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"topo_connection_cache": {
@@ -1559,7 +1391,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "topo_connection_cache",
-			"RetryMax": 1,
 			"Tags": []
 		},
 		"prscomplex": {
@@ -1568,7 +1399,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vttablet_prscomplex",
-			"RetryMax": 1,
 			"Tags": [""]
 		},
 		"prssettingspool": {
@@ -1577,7 +1407,6 @@
 			"Command": [],
 			"Manual": false,
 			"Shard": "vttablet_prscomplex",
-			"RetryMax": 1,
 			"Tags": [""]
 		}
 	}
diff --git a/test/config_partial_keyspace.json b/test/config_partial_keyspace.json
index bcd445d34bc..93adcafc275 100644
--- a/test/config_partial_keyspace.json
+++ b/test/config_partial_keyspace.json
@@ -6,7 +6,6 @@
       "Command": [],
       "Manual": false,
       "Shard": "vtgate_partial_keyspace",
-      "RetryMax": 2,
       "Tags": []
     },
     "vtgate_sequence_partial_keyspace": {
@@ -15,7 +14,6 @@
       "Command": [],
       "Manual": false,
       "Shard": "vtgate_partial_keyspace",
-      "RetryMax": 1,
       "Tags": []
     },
     "errs_as_warns_partial_keyspace": {
@@ -24,7 +22,6 @@
       "Command": [],
       "Manual": false,
       "Shard": "vtgate_partial_keyspace",
-      "RetryMax": 1,
       "Tags": []
     },
     "vtgate_transaction_partial_keyspace": {
@@ -33,7 +30,6 @@
       "Command": [],
       "Manual": false,
       "Shard": "vtgate_partial_keyspace",
-      "RetryMax": 1,
       "Tags": []
     },
     "vtgate_transaction_rollback_partial_keyspace": {
@@ -42,7 +38,6 @@
       "Command": [],
       "Manual": false,
       "Shard": "vtgate_partial_keyspace",
-      "RetryMax": 1,
       "Tags": []
     },
     "vtgate_transaction_single_partial_keyspace": {
@@ -51,7 +46,6 @@
       "Command": [],
       "Manual": false,
       "Shard": "vtgate_partial_keyspace",
-      "RetryMax": 1,
       "Tags": []
     },
     "vtgate_transaction_partial_exec_partial_keyspace": {
@@ -60,7 +54,6 @@
       "Command": [],
       "Manual": false,
       "Shard": "vtgate_partial_keyspace",
-      "RetryMax": 1,
       "Tags": []
     },
     "vtgate_queries_aggregation_partial_keyspace": {
@@ -69,7 +62,6 @@
       "Command": [],
       "Manual": false,
       "Shard": "vtgate_partial_keyspace",
-      "RetryMax": 2,
       "Tags": []
     },
     "vtgate_queries_foundrows_partial_keyspace": {
@@ -78,7 +70,6 @@
       "Command": [],
       "Manual": false,
       "Shard": "vtgate_partial_keyspace",
-      "RetryMax": 2,
       "Tags": []
     },
     "vtgate_queries_informationschema_partial_keyspace": {
@@ -87,7 +78,6 @@
       "Command": [],
       "Manual": false,
       "Shard": "vtgate_partial_keyspace",
-      "RetryMax": 2,
       "Tags": []
     },
     "vtgate_queries_misc_partial_keyspace": {
@@ -96,7 +86,6 @@
       "Command": [],
       "Manual": false,
       "Shard": "vtgate_partial_keyspace",
-      "RetryMax": 1,
       "Tags": []
     },
     "vtgate_queries_normalize_partial_keyspace": {
@@ -105,7 +94,6 @@
       "Command": [],
       "Manual": false,
       "Shard": "vtgate_partial_keyspace",
-      "RetryMax": 2,
       "Tags": []
     },
     "vtgate_queries_orderby_partial_keyspace": {
@@ -114,7 +102,6 @@
       "Command": [],
       "Manual": false,
       "Shard": "vtgate_partial_keyspace",
-      "RetryMax": 2,
       "Tags": ["upgrade_downgrade_query_serving_queries"]
     },
     "vtgate_queries_subquery_partial_keyspace": {
@@ -123,7 +110,6 @@
       "Command": [],
       "Manual": false,
       "Shard": "vtgate_partial_keyspace",
-      "RetryMax": 2,
       "Tags": ["upgrade_downgrade_query_serving_queries"]
     },
     "vtgate_queries_union_partial_keyspace": {
@@ -132,7 +118,6 @@
       "Command": [],
       "Manual": false,
       "Shard": "vtgate_partial_keyspace",
-      "RetryMax": 2,
       "Tags": ["upgrade_downgrade_query_serving_queries"]
     },
     "vtgate_queries_insert_partial_keyspace": {
@@ -141,7 +126,6 @@
       "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 7a3286ba3d3..ad960effe20 100644
--- a/test/templates/cluster_endtoend_test.tpl
+++ b/test/templates/cluster_endtoend_test.tpl
@@ -145,8 +145,6 @@ jobs:
 
         go mod download
 
-        # install JUnit report formatter
-        go install github.com/vitessio/go-junit-report@{{.GoJunitReport.SHA}} # {{.GoJunitReport.Comment}}
 
     {{if .NeedsMinio }}
     - name: Install Minio
@@ -222,8 +220,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()
@@ -231,15 +228,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 4ba09ebca61..14a4834897d 100644
--- a/test/templates/cluster_endtoend_test_docker.tpl
+++ b/test/templates/cluster_endtoend_test_docker.tpl
@@ -84,3 +84,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 d55ec2c0553..3dca43cbfc5 100755
--- a/tools/e2e_go_test.sh
+++ b/tools/e2e_go_test.sh
@@ -1,4 +1,20 @@
 #!/bin/bash
+
 source build.env
+
 echo "running tests for " "$@"
-go test -v "$@" -alsologtostderr -count=1
+
+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[@]}" -- -v -count=1 "$@" -args -alsologtostderr

From 4b1ac90a29bc62ca937fe61ae38f7fcc3443dcea Mon Sep 17 00:00:00 2001
From: Mohamed Hamza <mhamza@fastmail.com>
Date: Tue, 20 Jan 2026 14:58:32 -0500
Subject: [PATCH 02/11] split packages

Signed-off-by: Mohamed Hamza <mhamza@fastmail.com>
---
 test.go                           |    8 +-
 test/README.md                    |    5 +-
 test/config.json                  | 1181 ++++++++++++++++++++++++-----
 test/config_partial_keyspace.json |  101 ++-
 tools/e2e_go_test.sh              |    9 +-
 5 files changed, 1085 insertions(+), 219 deletions(-)

diff --git a/test.go b/test.go
index 3223d70c99f..e0733326a6b 100755
--- a/test.go
+++ b/test.go
@@ -123,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
@@ -185,6 +187,7 @@ func (t *Test) run(dir, dataDir string) ([]byte, error) {
 			if *keepData {
 				testCmd = append(testCmd, "-keep-data")
 			}
+
 		} else {
 			testCmd = []string{"test/" + t.File, "-v", "--skip-build", utils.GetFlagVariantForTests("--keep-logs")}
 			testCmd = append(testCmd, t.Args...)
@@ -224,6 +227,7 @@ func (t *Test) run(dir, dataDir string) ([]byte, error) {
 		// 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),
diff --git a/test/README.md b/test/README.md
index 9b3ea6b547c..196e3f05d06 100644
--- a/test/README.md
+++ b/test/README.md
@@ -26,14 +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,
 			"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 12200a11165..20d1a61e38e 100644
--- a/test/config.json
+++ b/test/config.json
@@ -2,6 +2,7 @@
 	"Tests": {
 		"java": {
 			"File": "",
+			"Packages": [],
 			"Args": [],
 			"Command": [
 				"make",
@@ -13,6 +14,7 @@
 		},
 		"client_test": {
 			"File": "",
+			"Packages": [],
 			"Args": [],
 			"Command": [
 				"test/client_test.sh"
@@ -23,6 +25,7 @@
 		},
 		"e2e": {
 			"File": "",
+			"Packages": [],
 			"Args": [],
 			"Command": [
 				"tools/e2e_test_runner.sh"
@@ -33,6 +36,7 @@
 		},
 		"e2e_race": {
 			"File": "",
+			"Packages": [],
 			"Args": [],
 			"Command": [
 				"make",
@@ -44,6 +48,7 @@
 		},
 		"unit": {
 			"File": "",
+			"Packages": [],
 			"Args": [],
 			"Command": [
 				"tools/unit_test_runner.sh"
@@ -54,6 +59,7 @@
 		},
 		"unit_race": {
 			"File": "",
+			"Packages": [],
 			"Args": [],
 			"Command": [
 				"make",
@@ -65,6 +71,7 @@
 		},
 		"local_example": {
 			"File": "",
+			"Packages": [],
 			"Args": [],
 			"Command": [
 				"test/local_example.sh"
@@ -75,6 +82,7 @@
 		},
 		"region_example": {
 			"File": "",
+			"Packages": [],
 			"Args": [],
 			"Command": [
 				"test/region_example.sh"
@@ -85,7 +93,13 @@
 		},
 		"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",
@@ -93,7 +107,13 @@
 		},
 		"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",
@@ -101,7 +121,13 @@
 		},
 		"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",
@@ -109,7 +135,13 @@
 		},
 		"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",
@@ -117,7 +149,13 @@
 		},
 		"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",
@@ -125,7 +163,13 @@
 		},
 		"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",
@@ -133,15 +177,29 @@
 		},
 		"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",
-			"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",
@@ -149,7 +207,15 @@
 		},
 		"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",
@@ -157,7 +223,15 @@
 		},
 		"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",
@@ -165,7 +239,10 @@
 		},
 		"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",
@@ -173,15 +250,23 @@
 		},
 		"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",
-			"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",
@@ -189,7 +274,10 @@
 		},
 		"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",
@@ -197,7 +285,10 @@
 		},
 		"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",
@@ -205,7 +296,10 @@
 		},
 		"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",
@@ -213,7 +307,10 @@
 		},
 		"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",
@@ -221,7 +318,10 @@
 		},
 		"unmanaged_ssl_check": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/encryption/unmanagedsslcheck"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/encryption/unmanagedsslcheck"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "12",
@@ -229,7 +329,10 @@
 		},
 		"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",
@@ -239,7 +342,10 @@
 		},
 		"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",
@@ -249,7 +355,10 @@
 		},
 		"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",
@@ -259,7 +368,13 @@
 		},
 		"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",
@@ -267,7 +382,13 @@
 		},
 		"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",
@@ -275,7 +396,13 @@
 		},
 		"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",
@@ -283,7 +410,13 @@
 		},
 		"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",
@@ -291,7 +424,13 @@
 		},
 		"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",
@@ -299,7 +438,13 @@
 		},
 		"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",
@@ -307,15 +452,29 @@
 		},
 		"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",
-			"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",
@@ -323,7 +482,10 @@
 		},
 		"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",
@@ -331,31 +493,58 @@
 		},
 		"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",
-			"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",
-			"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",
-			"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",
@@ -363,7 +552,10 @@
 		},
 		"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",
@@ -371,7 +563,10 @@
 		},
 		"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",
@@ -379,7 +574,10 @@
 		},
 		"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",
@@ -387,7 +585,10 @@
 		},
 		"vtctldclient": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtctldclient"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtctldclient"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "15",
@@ -395,7 +596,10 @@
 		},
 		"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",
@@ -405,7 +609,10 @@
 		},
 		"tabletmanager_primary": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/tabletmanager/primary"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/tabletmanager/primary"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "18",
@@ -413,7 +620,10 @@
 		},
 		"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",
@@ -421,8 +631,11 @@
 		},
 		"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,
@@ -433,7 +646,10 @@
 		},
 		"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",
@@ -443,7 +659,10 @@
 		},
 		"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",
@@ -453,8 +672,11 @@
 		},
 		"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,
@@ -465,7 +687,18 @@
 		},
 		"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",
@@ -473,7 +706,10 @@
 		},
 		"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",
@@ -481,7 +717,10 @@
 		},
 		"vtgate_tablet_healthcheck": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/tablet_healthcheck"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/tablet_healthcheck"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_general_heavy",
@@ -489,7 +728,10 @@
 		},
 		"vtgate_tabletbalancer": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/tabletbalancer"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/tabletbalancer"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_general_heavy",
@@ -497,7 +739,10 @@
 		},
 		"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",
@@ -505,143 +750,243 @@
 		},
 		"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",
-			"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",
-			"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",
-			"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",
-			"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",
-			"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",
-			"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",
-			"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",
-			"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",
-			"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",
-			"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",
-			"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",
-			"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",
-			"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",
-			"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",
-			"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",
-			"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",
-			"Tags": ["upgrade_downgrade_query_serving_queries_2"]
+			"Tags": [
+				"upgrade_downgrade_query_serving_queries_2"
+			]
 		},
 		"vtgate_queries_lookup_queries": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/queries/lookup_queries"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/queries/lookup_queries"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_queries",
@@ -649,7 +994,10 @@
 		},
 		"vtgate_queries_orderby_without_schematracker": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/queries/orderby/without_schematracker"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/queries/orderby/without_schematracker"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_queries",
@@ -657,7 +1005,10 @@
 		},
 		"mysql_vs_vitess": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/utils/mysqlvsvitess"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/utils/mysqlvsvitess"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_queries",
@@ -665,15 +1016,23 @@
 		},
 		"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",
-			"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",
@@ -681,15 +1040,26 @@
 		},
 		"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",
-			"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",
@@ -697,7 +1067,10 @@
 		},
 		"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",
@@ -705,39 +1078,74 @@
 		},
 		"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",
-			"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",
-			"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",
-			"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",
-			"Tags": ["upgrade_downgrade_query_serving_schema"]
+			"Tags": [
+				"upgrade_downgrade_query_serving_schema"
+			]
 		},
 		"vtgate_schematracker_multi_ks": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/schematracker/multi_ks"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/schematracker/multi_ks"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_schema_tracker",
@@ -745,7 +1153,10 @@
 		},
 		"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",
@@ -753,7 +1164,10 @@
 		},
 		"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",
@@ -761,7 +1175,10 @@
 		},
 		"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",
@@ -769,7 +1186,10 @@
 		},
 		"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",
@@ -777,7 +1197,10 @@
 		},
 		"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",
@@ -785,7 +1208,10 @@
 		},
 		"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",
@@ -793,7 +1219,10 @@
 		},
 		"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",
@@ -801,7 +1230,13 @@
 		},
 		"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",
@@ -809,7 +1244,10 @@
 		},
 		"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",
@@ -817,7 +1255,10 @@
 		},
 		"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",
@@ -825,7 +1266,10 @@
 		},
 		"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",
@@ -833,7 +1277,10 @@
 		},
 		"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",
@@ -841,7 +1288,10 @@
 		},
 		"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",
@@ -849,7 +1299,10 @@
 		},
 		"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",
@@ -857,7 +1310,10 @@
 		},
 		"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",
@@ -865,7 +1321,10 @@
 		},
 		"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",
@@ -873,7 +1332,10 @@
 		},
 		"vtgate_transaction_timeout": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtgate/queries/transaction_timeout"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtgate/queries/transaction_timeout"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "vtgate_transaction",
@@ -881,7 +1343,10 @@
 		},
 		"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",
@@ -889,7 +1354,10 @@
 		},
 		"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",
@@ -897,7 +1365,10 @@
 		},
 		"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",
@@ -905,15 +1376,26 @@
 		},
 		"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",
-			"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",
@@ -921,7 +1403,10 @@
 		},
 		"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",
@@ -929,7 +1414,10 @@
 		},
 		"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",
@@ -937,7 +1425,10 @@
 		},
 		"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",
@@ -945,7 +1436,13 @@
 		},
 		"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",
@@ -953,7 +1450,10 @@
 		},
 		"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",
@@ -961,7 +1461,10 @@
 		},
 		"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",
@@ -969,7 +1472,10 @@
 		},
 		"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",
@@ -977,7 +1483,10 @@
 		},
 		"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",
@@ -985,7 +1494,12 @@
 		},
 		"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",
@@ -993,7 +1507,12 @@
 		},
 		"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",
@@ -1001,7 +1520,10 @@
 		},
 		"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",
@@ -1009,7 +1531,10 @@
 		},
 		"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",
@@ -1017,7 +1542,10 @@
 		},
 		"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",
@@ -1025,7 +1553,10 @@
 		},
 		"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",
@@ -1033,7 +1564,10 @@
 		},
 		"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",
@@ -1041,7 +1575,10 @@
 		},
 		"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",
@@ -1049,7 +1586,10 @@
 		},
 		"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",
@@ -1057,7 +1597,10 @@
 		},
 		"vtcombo_recreate": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/vtcombo/recreate"],
+			"Packages": [
+				"vitess.io/vitess/go/test/endtoend/vtcombo/recreate"
+			],
+			"Args": [],
 			"Command": [],
 			"Manual": false,
 			"Shard": "docker_cluster",
@@ -1065,7 +1608,10 @@
 		},
 		"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",
@@ -1073,7 +1619,13 @@
 		},
 		"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",
@@ -1081,7 +1633,13 @@
 		},
 		"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",
@@ -1089,7 +1647,13 @@
 		},
 		"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",
@@ -1097,7 +1661,13 @@
 		},
 		"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",
@@ -1105,7 +1675,13 @@
 		},
 		"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",
@@ -1113,7 +1689,13 @@
 		},
 		"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",
@@ -1121,7 +1703,13 @@
 		},
 		"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",
@@ -1129,7 +1717,13 @@
 		},
 		"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",
@@ -1137,7 +1731,13 @@
 		},
 		"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",
@@ -1145,7 +1745,13 @@
 		},
 		"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",
@@ -1153,7 +1759,13 @@
 		},
 		"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",
@@ -1161,7 +1773,15 @@
 		},
 		"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",
@@ -1169,7 +1789,15 @@
 		},
 		"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",
@@ -1177,7 +1805,13 @@
 		},
 		"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",
@@ -1185,7 +1819,13 @@
 		},
 		"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",
@@ -1193,7 +1833,13 @@
 		},
 		"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",
@@ -1201,7 +1847,15 @@
 		},
 		"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",
@@ -1209,7 +1863,13 @@
 		},
 		"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",
@@ -1217,7 +1877,13 @@
 		},
 		"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",
@@ -1225,7 +1891,13 @@
 		},
 		"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",
@@ -1233,7 +1905,13 @@
 		},
 		"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",
@@ -1241,6 +1919,7 @@
 		},
 		"vtop_example": {
 			"File": "",
+			"Packages": [],
 			"Args": [],
 			"Command": [
 				"test/vtop_example.sh"
@@ -1251,7 +1930,10 @@
 		},
 		"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",
@@ -1259,7 +1941,10 @@
 		},
 		"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",
@@ -1267,7 +1952,10 @@
 		},
 		"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",
@@ -1275,7 +1963,10 @@
 		},
 		"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",
@@ -1283,7 +1974,10 @@
 		},
 		"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",
@@ -1291,7 +1985,15 @@
 		},
 		"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",
@@ -1299,7 +2001,15 @@
 		},
 		"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",
@@ -1307,7 +2017,13 @@
 		},
 		"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",
@@ -1315,7 +2031,13 @@
 		},
 		"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",
@@ -1323,7 +2045,15 @@
 		},
 		"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",
@@ -1331,7 +2061,15 @@
 		},
 		"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",
@@ -1339,7 +2077,15 @@
 		},
 		"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",
@@ -1347,7 +2093,15 @@
 		},
 		"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",
@@ -1355,7 +2109,15 @@
 		},
 		"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",
@@ -1363,7 +2125,13 @@
 		},
 		"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",
@@ -1371,7 +2139,13 @@
 		},
 		"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",
@@ -1379,7 +2153,10 @@
 		},
 		"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",
@@ -1387,7 +2164,13 @@
 		},
 		"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",
@@ -1395,19 +2178,29 @@
 		},
 		"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",
-			"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",
-			"Tags": [""]
+			"Tags": [
+				""
+			]
 		}
 	}
 }
diff --git a/test/config_partial_keyspace.json b/test/config_partial_keyspace.json
index 93adcafc275..2c3570aad76 100644
--- a/test/config_partial_keyspace.json
+++ b/test/config_partial_keyspace.json
@@ -2,7 +2,10 @@
   "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",
@@ -10,7 +13,10 @@
     },
     "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",
@@ -18,7 +24,10 @@
     },
     "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",
@@ -26,7 +35,10 @@
     },
     "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",
@@ -34,7 +46,10 @@
     },
     "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",
@@ -42,7 +57,10 @@
     },
     "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",
@@ -50,7 +68,10 @@
     },
     "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",
@@ -58,7 +79,10 @@
     },
     "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",
@@ -66,7 +90,10 @@
     },
     "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",
@@ -74,7 +101,10 @@
     },
     "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",
@@ -82,7 +112,10 @@
     },
     "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",
@@ -90,7 +123,10 @@
     },
     "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",
@@ -98,31 +134,58 @@
     },
     "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",
-      "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",
-      "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",
-      "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",
diff --git a/tools/e2e_go_test.sh b/tools/e2e_go_test.sh
index 3dca43cbfc5..7d9dc686aa3 100755
--- a/tools/e2e_go_test.sh
+++ b/tools/e2e_go_test.sh
@@ -2,7 +2,12 @@
 
 source build.env
 
-echo "running tests for " "$@"
+echo "running tests for $PACKAGES"
+
+if [[ -z "${PACKAGES:-}" ]]; then
+	echo "ERROR: PACKAGES is empty"
+	exit 1
+fi
 
 GOTESTSUM_ARGS=(
 	--format github-actions
@@ -17,4 +22,4 @@ if [[ -n "${JUNIT_OUTPUT:-}" ]]; then
 	GOTESTSUM_ARGS+=("--junitfile" "$JUNIT_OUTPUT")
 fi
 
-go tool gotestsum "${GOTESTSUM_ARGS[@]}" -- -v -count=1 "$@" -args -alsologtostderr
+go tool gotestsum "${GOTESTSUM_ARGS[@]}" --packages "$PACKAGES" -- -v -count=1 "$@" -alsologtostderr

From e19f65812203de082eba968b804bd1ea8681a61f Mon Sep 17 00:00:00 2001
From: Mohamed Hamza <mhamza@fastmail.com>
Date: Tue, 20 Jan 2026 15:11:17 -0500
Subject: [PATCH 03/11] add -args

Signed-off-by: Mohamed Hamza <mhamza@fastmail.com>
---
 tools/e2e_go_test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/e2e_go_test.sh b/tools/e2e_go_test.sh
index 7d9dc686aa3..c3b94029f0a 100755
--- a/tools/e2e_go_test.sh
+++ b/tools/e2e_go_test.sh
@@ -22,4 +22,4 @@ if [[ -n "${JUNIT_OUTPUT:-}" ]]; then
 	GOTESTSUM_ARGS+=("--junitfile" "$JUNIT_OUTPUT")
 fi
 
-go tool gotestsum "${GOTESTSUM_ARGS[@]}" --packages "$PACKAGES" -- -v -count=1 "$@" -alsologtostderr
+go tool gotestsum "${GOTESTSUM_ARGS[@]}" --packages "$PACKAGES" -- -v -count=1 "$@" -args -alsologtostderr

From e1ac7022d318612d9e139f43ff1b3acb238585bd Mon Sep 17 00:00:00 2001
From: Mohamed Hamza <mhamza@fastmail.com>
Date: Tue, 20 Jan 2026 15:21:33 -0500
Subject: [PATCH 04/11] fix example workflows

Signed-off-by: Mohamed Hamza <mhamza@fastmail.com>
---
 .github/workflows/local_example.yml  | 2 +-
 .github/workflows/region_example.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/local_example.yml b/.github/workflows/local_example.yml
index de79c682e01..8be1d2c52bd 100644
--- a/.github/workflows/local_example.yml
+++ b/.github/workflows/local_example.yml
@@ -89,4 +89,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 9291798b45f..366fd6e7c52 100644
--- a/.github/workflows/region_example.yml
+++ b/.github/workflows/region_example.yml
@@ -89,4 +89,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

From 1949b0fe5fb6568eb5ba815a40b80d500d713b04 Mon Sep 17 00:00:00 2001
From: Mohamed Hamza <mhamza@fastmail.com>
Date: Tue, 20 Jan 2026 15:48:56 -0500
Subject: [PATCH 05/11] fix vtop example

Signed-off-by: Mohamed Hamza <mhamza@fastmail.com>
---
 .github/workflows/vtop_example.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/vtop_example.yml b/.github/workflows/vtop_example.yml
index 4fa5764b4aa..307da5decb3 100644
--- a/.github/workflows/vtop_example.yml
+++ b/.github/workflows/vtop_example.yml
@@ -7,9 +7,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
@@ -35,13 +35,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'
@@ -97,4 +97,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

From 0a4365291239318686839aeed0442abc98c9d66a Mon Sep 17 00:00:00 2001
From: Mohamed Hamza <mhamza@fastmail.com>
Date: Tue, 20 Jan 2026 16:00:01 -0500
Subject: [PATCH 06/11] Update test.go

Signed-off-by: Mohamed Hamza <mhamza@fastmail.com>
---
 test.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test.go b/test.go
index e0733326a6b..46a5e9d7d2e 100755
--- a/test.go
+++ b/test.go
@@ -187,7 +187,6 @@ func (t *Test) run(dir, dataDir string) ([]byte, error) {
 			if *keepData {
 				testCmd = append(testCmd, "-keep-data")
 			}
-
 		} else {
 			testCmd = []string{"test/" + t.File, "-v", "--skip-build", utils.GetFlagVariantForTests("--keep-logs")}
 			testCmd = append(testCmd, t.Args...)

From 605b763ed91f628f848c4c10ec448b6b0e66207b Mon Sep 17 00:00:00 2001
From: Mohamed Hamza <mhamza@fastmail.com>
Date: Tue, 20 Jan 2026 16:00:32 -0500
Subject: [PATCH 07/11] Update test.go

Signed-off-by: Mohamed Hamza <mhamza@fastmail.com>
---
 test.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test.go b/test.go
index 46a5e9d7d2e..9e1b09dfa81 100755
--- a/test.go
+++ b/test.go
@@ -348,6 +348,7 @@ func main() {
 	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, 0644)
 	if err != nil {
 		log.Fatalf("Can't create log file: %v", err)

From eac2ce15c263d9f5260a7f035cb3f20e114028f7 Mon Sep 17 00:00:00 2001
From: Mohamed Hamza <mhamza@fastmail.com>
Date: Tue, 20 Jan 2026 17:05:10 -0500
Subject: [PATCH 08/11] fix docker test

Signed-off-by: Mohamed Hamza <mhamza@fastmail.com>
---
 docker/test/run.sh | 6 ++++++
 1 file changed, 6 insertions(+)

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`

From 1849709e0305b6f23f6bec135e397ce359400b24 Mon Sep 17 00:00:00 2001
From: Mohamed Hamza <mhamza@fastmail.com>
Date: Tue, 27 Jan 2026 14:38:25 -0500
Subject: [PATCH 09/11] remove redundant empty default

Signed-off-by: Mohamed Hamza <mhamza@fastmail.com>
---
 tools/e2e_go_test.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/e2e_go_test.sh b/tools/e2e_go_test.sh
index c3b94029f0a..c519b5589df 100755
--- a/tools/e2e_go_test.sh
+++ b/tools/e2e_go_test.sh
@@ -4,7 +4,7 @@ source build.env
 
 echo "running tests for $PACKAGES"
 
-if [[ -z "${PACKAGES:-}" ]]; then
+if [[ -z "$PACKAGES" ]]; then
 	echo "ERROR: PACKAGES is empty"
 	exit 1
 fi
@@ -18,7 +18,7 @@ GOTESTSUM_ARGS=(
 	--hide-summary=skipped
 )
 
-if [[ -n "${JUNIT_OUTPUT:-}" ]]; then
+if [[ -n "$JUNIT_OUTPUT" ]]; then
 	GOTESTSUM_ARGS+=("--junitfile" "$JUNIT_OUTPUT")
 fi
 

From 959dd5f33520b82b3a9c7b9c6b675983cd27f609 Mon Sep 17 00:00:00 2001
From: Mohamed Hamza <mhamza@fastmail.com>
Date: Wed, 28 Jan 2026 10:41:33 -0500
Subject: [PATCH 10/11] pass through JUNIT_OUTPUT

Signed-off-by: Mohamed Hamza <mhamza@fastmail.com>
---
 docker/test/run.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docker/test/run.sh b/docker/test/run.sh
index f41e2b49c89..d6211cbc88d 100755
--- a/docker/test/run.sh
+++ b/docker/test/run.sh
@@ -151,6 +151,11 @@ if [[ -n "$PACKAGES" ]]; then
   args="$args -e PACKAGES=$PACKAGES"
 fi
 
+# Pass through JUNIT_OUTPUT environment variable if it's set
+if [[ -n "$JUNIT_OUTPUT" ]]; then
+  args="$args -e JUNIT_OUTPUT=$JUNIT_OUTPUT"
+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`

From a53083dd6b8bc9bac5d21264cc5ada924d0d9a61 Mon Sep 17 00:00:00 2001
From: Mohamed Hamza <mhamza@fastmail.com>
Date: Wed, 28 Jan 2026 12:36:23 -0500
Subject: [PATCH 11/11] Remove junit for docker tests

The docker CI workflow doesn't currently use the junit reports, so
removing it from the script.

Signed-off-by: Mohamed Hamza <mhamza@fastmail.com>
---
 docker/test/run.sh | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/docker/test/run.sh b/docker/test/run.sh
index d6211cbc88d..f41e2b49c89 100755
--- a/docker/test/run.sh
+++ b/docker/test/run.sh
@@ -151,11 +151,6 @@ if [[ -n "$PACKAGES" ]]; then
   args="$args -e PACKAGES=$PACKAGES"
 fi
 
-# Pass through JUNIT_OUTPUT environment variable if it's set
-if [[ -n "$JUNIT_OUTPUT" ]]; then
-  args="$args -e JUNIT_OUTPUT=$JUNIT_OUTPUT"
-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`