diff --git a/.github/workflows/dendrite.yml b/.github/workflows/dendrite.yml
index f8019b3ea..4eed20d9f 100644
--- a/.github/workflows/dendrite.yml
+++ b/.github/workflows/dendrite.yml
@@ -109,6 +109,11 @@ jobs:
         uses: actions/setup-go@v3
         with:
           go-version: ${{ matrix.go }}
+      - name: Set up gotestfmt
+        uses: gotesttools/gotestfmt-action@v2
+        with:
+          # Optional: pass GITHUB_TOKEN to avoid rate limiting.
+          token: ${{ secrets.GITHUB_TOKEN }}
       - uses: actions/cache@v3
         with:
           path: |
@@ -117,7 +122,7 @@ jobs:
           key: ${{ runner.os }}-go${{ matrix.go }}-test-${{ hashFiles('**/go.sum') }}
           restore-keys: |
             ${{ runner.os }}-go${{ matrix.go }}-test-
-      - run: go test ./...
+      - run: go test ./... | gotestfmt
         env:
           POSTGRES_HOST: localhost
           POSTGRES_USER: postgres
diff --git a/setup/config/config_global.go b/setup/config/config_global.go
index 977e6a49c..825772827 100644
--- a/setup/config/config_global.go
+++ b/setup/config/config_global.go
@@ -12,8 +12,6 @@ import (
 
 type Global struct {
 	// The name of the server. This is usually the domain name, e.g 'matrix.org', 'localhost'.
-	//
-	// Deprecated: Don't check this.
 	ServerName gomatrixserverlib.ServerName `yaml:"server_name"`
 
 	// The secondary server names, used for virtual hosting.