diff --git a/cmd/server_test.go b/cmd/server_test.go
index 85f09ff117..81b834151d 100644
--- a/cmd/server_test.go
+++ b/cmd/server_test.go
@@ -223,7 +223,7 @@ func TestUserConfigAllTested(t *testing.T) {
 		userConfigKey := u.Field(i).Tag.Get("mapstructure")
 		t.Run(userConfigKey, func(t *testing.T) {
 			// By default, we expect all fields in UserConfig to have flags defined in server.go and tested here in server_test.go
-			// Some fields are too complicated to have flags, so are only expressible in the yaml
+			// Some fields are too complicated to have flags, so are only expressible in the config yaml
 			flagKey := u.Field(i).Tag.Get("flag")
 			if flagKey == "false" {
 				return
@@ -231,7 +231,7 @@ func TestUserConfigAllTested(t *testing.T) {
 			// If a setting is configured in server.UserConfig, it should be tested here. If there is no corresponding const
 			// for specifying the flag, that probably means one *also* needs to be added to server.go
 			if _, ok := testFlags[userConfigKey]; !ok {
-				t.Errorf("server.UserConfig has field with mapstructure %s that is either not tested or not configured as a flag. Either add it to server_test.testFlags, or remove it from server.UserConfig", userConfigKey)
+				t.Errorf("server.UserConfig has field with mapstructure %s that is not tested, and potentially also not configured as a flag. Either add it to testFlags (and potentially as a const in cmd/server), or remove it from server.UserConfig", userConfigKey)
 			}
 		})