diff --git a/.github/workflows/nightly-test-integrations-1.15.x.yml b/.github/workflows/nightly-test-integrations-1.15.x.yml
index c570a541ab..a6f2ce184f 100644
--- a/.github/workflows/nightly-test-integrations-1.15.x.yml
+++ b/.github/workflows/nightly-test-integrations-1.15.x.yml
@@ -14,7 +14,7 @@ env:
   TEST_RESULTS_ARTIFACT_NAME: test-results
   CONSUL_LICENSE: ${{ secrets.CONSUL_LICENSE }}
   GOTAGS: ${{ endsWith(github.repository, '-enterprise') && 'consulent' || '' }}
-  GOTESTSUM_VERSION: "1.10.1"
+  GOTESTSUM_VERSION: "1.11.0"
   CONSUL_BINARY_UPLOAD_NAME: consul-bin
   # strip the hashicorp/ off the front of github.repository for consul
   CONSUL_LATEST_IMAGE_NAME: ${{ endsWith(github.repository, '-enterprise') && github.repository || 'hashicorp/consul' }}
@@ -234,9 +234,8 @@ jobs:
           docker run --rm ${{ env.CONSUL_LATEST_IMAGE_NAME }}:local consul version
           go run gotest.tools/gotestsum@v${{env.GOTESTSUM_VERSION}} \
             --raw-command \
-            --format=short-verbose \
-            --debug \
-            --rerun-fails=2 \
+            --format=github-actions \
+            --rerun-fails \
             --packages="./..." \
             -- \
             go test \
diff --git a/.github/workflows/nightly-test-integrations-1.16.x.yml b/.github/workflows/nightly-test-integrations-1.16.x.yml
index d9a771c3fe..2492f5c80a 100644
--- a/.github/workflows/nightly-test-integrations-1.16.x.yml
+++ b/.github/workflows/nightly-test-integrations-1.16.x.yml
@@ -14,7 +14,7 @@ env:
   TEST_RESULTS_ARTIFACT_NAME: test-results
   CONSUL_LICENSE: ${{ secrets.CONSUL_LICENSE }}
   GOTAGS: ${{ endsWith(github.repository, '-enterprise') && 'consulent' || '' }}
-  GOTESTSUM_VERSION: "1.10.1"
+  GOTESTSUM_VERSION: "1.11.0"
   CONSUL_BINARY_UPLOAD_NAME: consul-bin
   # strip the hashicorp/ off the front of github.repository for consul
   CONSUL_LATEST_IMAGE_NAME: ${{ endsWith(github.repository, '-enterprise') && github.repository || 'hashicorp/consul' }}
@@ -255,9 +255,8 @@ jobs:
           docker run --rm ${{ env.CONSUL_LATEST_IMAGE_NAME }}:local consul version
           go run gotest.tools/gotestsum@v${{env.GOTESTSUM_VERSION}} \
             --raw-command \
-            --format=short-verbose \
-            --debug \
-            --rerun-fails=2 \
+            --format=github-actions \
+            --rerun-fails \
             --packages="./..." \
             -- \
             go test \
diff --git a/.github/workflows/nightly-test-integrations-1.17.x.yml b/.github/workflows/nightly-test-integrations-1.17.x.yml
index 7d242ffe83..1dc692e010 100644
--- a/.github/workflows/nightly-test-integrations-1.17.x.yml
+++ b/.github/workflows/nightly-test-integrations-1.17.x.yml
@@ -14,7 +14,7 @@ env:
   TEST_RESULTS_ARTIFACT_NAME: test-results
   CONSUL_LICENSE: ${{ secrets.CONSUL_LICENSE }}
   GOTAGS: ${{ endsWith(github.repository, '-enterprise') && 'consulent' || '' }}
-  GOTESTSUM_VERSION: "1.10.1"
+  GOTESTSUM_VERSION: "1.11.0"
   CONSUL_BINARY_UPLOAD_NAME: consul-bin
   # strip the hashicorp/ off the front of github.repository for consul
   CONSUL_LATEST_IMAGE_NAME: ${{ endsWith(github.repository, '-enterprise') && github.repository || 'hashicorp/consul' }}
@@ -255,9 +255,8 @@ jobs:
           docker run --rm ${{ env.CONSUL_LATEST_IMAGE_NAME }}:local consul version
           go run gotest.tools/gotestsum@v${{env.GOTESTSUM_VERSION}} \
             --raw-command \
-            --format=short-verbose \
-            --debug \
-            --rerun-fails=2 \
+            --format=github-actions \
+            --rerun-fails \
             --packages="./..." \
             -- \
             go test \
diff --git a/.github/workflows/nightly-test-integrations.yml b/.github/workflows/nightly-test-integrations.yml
index 74cc5a77a0..96359458ad 100644
--- a/.github/workflows/nightly-test-integrations.yml
+++ b/.github/workflows/nightly-test-integrations.yml
@@ -14,7 +14,7 @@ env:
   TEST_RESULTS_ARTIFACT_NAME: test-results
   CONSUL_LICENSE: ${{ secrets.CONSUL_LICENSE }}
   GOTAGS: ${{ endsWith(github.repository, '-enterprise') && 'consulent' || '' }}
-  GOTESTSUM_VERSION: "1.10.1"
+  GOTESTSUM_VERSION: "1.11.0"
   CONSUL_BINARY_UPLOAD_NAME: consul-bin
   # strip the hashicorp/ off the front of github.repository for consul
   CONSUL_LATEST_IMAGE_NAME: ${{ endsWith(github.repository, '-enterprise') && github.repository || 'hashicorp/consul' }}
@@ -252,9 +252,8 @@ jobs:
           docker run --rm ${{ env.CONSUL_LATEST_IMAGE_NAME }}:local consul version
           go run gotest.tools/gotestsum@v${{env.GOTESTSUM_VERSION}} \
             --raw-command \
-            --format=short-verbose \
-            --debug \
-            --rerun-fails=2 \
+            --format=github-actions \
+            --rerun-fails \
             --packages="./..." \
             -- \
             go test \
@@ -349,8 +348,7 @@ jobs:
           docker run --rm ${{ env.CONSUL_LATEST_IMAGE_NAME }}:local consul version
           go run gotest.tools/gotestsum@v${{env.GOTESTSUM_VERSION}} \
             --raw-command \
-            --format=short-verbose \
-            --debug \
+            --format=github-actions \
             --packages="./..." \
             -- \
             go test \
@@ -433,13 +431,12 @@ jobs:
       - name: Upgrade Integration Tests
         run: |
           mkdir -p "${{ env.TEST_RESULTS_DIR }}"
-          export NOLOGBUFFER=1
+          #export NOLOGBUFFER=1
           cd ./test-integ/upgrade
           docker run --rm ${{ env.CONSUL_LATEST_IMAGE_NAME }}:local consul version
           go run gotest.tools/gotestsum@v${{env.GOTESTSUM_VERSION}} \
             --raw-command \
-            --format=standard-verbose \
-            --debug \
+            --format=github-actions \
             --packages="./..." \
             -- \
             go test \
diff --git a/.github/workflows/test-integrations-windows.yml b/.github/workflows/test-integrations-windows.yml
index 16f7b26fdc..29080a10ea 100644
--- a/.github/workflows/test-integrations-windows.yml
+++ b/.github/workflows/test-integrations-windows.yml
@@ -11,7 +11,7 @@ env:
   TEST_RESULTS_ARTIFACT_NAME: test-results
   CONSUL_LICENSE: ${{ secrets.CONSUL_LICENSE }}
   GOTAGS: ${{ endsWith(github.repository, '-enterprise') && 'consulent' || '' }}
-  GOTESTSUM_VERSION: "1.9.0"
+  GOTESTSUM_VERSION: "1.11.0"
   CONSUL_BINARY_UPLOAD_NAME: consul.exe
   # strip the hashicorp/ off the front of github.repository for consul
   CONSUL_LATEST_IMAGE_NAME: ${{ endsWith(github.repository, '-enterprise') && github.repository || 'consul' }}
diff --git a/.github/workflows/test-integrations.yml b/.github/workflows/test-integrations.yml
index f3c803e8fe..7782ec9b31 100644
--- a/.github/workflows/test-integrations.yml
+++ b/.github/workflows/test-integrations.yml
@@ -19,7 +19,7 @@ env:
   TEST_RESULTS_ARTIFACT_NAME: test-results
   CONSUL_LICENSE: ${{ secrets.CONSUL_LICENSE }}
   GOTAGS: ${{ endsWith(github.repository, '-enterprise') && 'consulent' || '' }}
-  GOTESTSUM_VERSION: "1.10.1"
+  GOTESTSUM_VERSION: "1.11.0"
   CONSUL_BINARY_UPLOAD_NAME: consul-bin
   # strip the hashicorp/ off the front of github.repository for consul
   CONSUL_LATEST_IMAGE_NAME: ${{ endsWith(github.repository, '-enterprise') && github.repository || 'hashicorp/consul' }}
@@ -110,7 +110,7 @@ jobs:
         run: |
           go install gotest.tools/gotestsum@v${{env.GOTESTSUM_VERSION}} && \
           gotestsum \
-            --format=short-verbose \
+            --format=github-actions \
             --rerun-fails \
             --rerun-fails-report=/tmp/gotestsum-rerun-fails \
             --packages="./command/agent/consul" \
@@ -184,17 +184,17 @@ jobs:
         run: |
           mkdir -p "${{ env.TEST_RESULTS_DIR }}"
           go run gotest.tools/gotestsum@v${{env.GOTESTSUM_VERSION}} \
-            --format=short-verbose \
+            --format=github-actions \
             --junitfile "${{ env.TEST_RESULTS_DIR }}/gotestsum-report.xml" \
             -- -tags "${{ env.GOTAGS }}" -cover -coverprofile=coverage.txt ./agent/connect/ca
           # Run leader tests that require Vault
           go run gotest.tools/gotestsum@v${{env.GOTESTSUM_VERSION}} \
-            --format=short-verbose \
+            --format=github-actions \
             --junitfile "${{ env.TEST_RESULTS_DIR }}/gotestsum-report-leader.xml" \
             -- -tags "${{ env.GOTAGS }}" -cover -coverprofile=coverage-leader.txt -run Vault ./agent/consul
           # Run agent tests that require Vault
           go run gotest.tools/gotestsum@v${{env.GOTESTSUM_VERSION}} \
-            --format=short-verbose \
+            --format=github-actions \
             --junitfile "${{ env.TEST_RESULTS_DIR }}/gotestsum-report-agent.xml" \
             -- -tags "${{ env.GOTAGS }}" -cover -coverprofile=coverage-agent.txt -run Vault ./agent
 
@@ -431,9 +431,8 @@ jobs:
             docker run --rm ${{ env.CONSUL_LATEST_IMAGE_NAME }}:local consul version
             go run gotest.tools/gotestsum@v${{env.GOTESTSUM_VERSION}} \
               --raw-command \
-              --format=pkgname-and-test-fails \
-              --debug \
-              --rerun-fails=3 \
+              --format=github-actions \
+              --rerun-fails \
               -- \
               go test \
               -p=6 \
@@ -514,12 +513,11 @@ jobs:
       - name: Integration Tests
         run: |
           mkdir -p "${{ env.TEST_RESULTS_DIR }}"
-          export NOLOGBUFFER=1
+          #export NOLOGBUFFER=1
           cd ./test-integ
           go run gotest.tools/gotestsum@v${{env.GOTESTSUM_VERSION}} \
             --raw-command \
-            --format=standard-verbose \
-            --debug \
+            --format=github-actions \
             -- \
             go test \
             -tags "${{ env.GOTAGS }}" \