diff --git a/test/server/config_validation/server_test.cc b/test/server/config_validation/server_test.cc
index cda36802a3dd8..f03ec5f217192 100644
--- a/test/server/config_validation/server_test.cc
+++ b/test/server/config_validation/server_test.cc
@@ -113,7 +113,7 @@ class JsonApplicationLogsValidationServerForbiddenFlagvTest : public ValidationS
   }
 };
 
-class JsonApplicationLogsValidationServerForbiddenFlag_Test : public ValidationServerTest {
+class JsonApplicationLogsValidationServerForbiddenFlagUnderscoreTest : public ValidationServerTest {
 public:
   static void SetUpTestSuite() { // NOLINT(readability-identifier-naming)
     setupTestDirectory();
@@ -306,7 +306,7 @@ INSTANTIATE_TEST_SUITE_P(
     ::testing::ValuesIn(
         JsonApplicationLogsValidationServerForbiddenFlagvTest::getAllConfigFiles()));
 
-TEST_P(JsonApplicationLogsValidationServerForbiddenFlag_Test, TestForbiddenFlag) {
+TEST_P(JsonApplicationLogsValidationServerForbiddenFlagUnderscoreTest, TestForbiddenFlag) {
   Thread::MutexBasicLockable access_log_lock;
   Stats::IsolatedStoreImpl stats_store;
   DangerousDeprecatedTestTime time_system;
@@ -320,9 +320,9 @@ TEST_P(JsonApplicationLogsValidationServerForbiddenFlag_Test, TestForbiddenFlag)
 }
 
 INSTANTIATE_TEST_SUITE_P(
-    AllConfigs, JsonApplicationLogsValidationServerForbiddenFlag_Test,
+    AllConfigs, JsonApplicationLogsValidationServerForbiddenFlagUnderscoreTest,
     ::testing::ValuesIn(
-        JsonApplicationLogsValidationServerForbiddenFlag_Test::getAllConfigFiles()));
+        JsonApplicationLogsValidationServerForbiddenFlagUnderscoreTest::getAllConfigFiles()));
 
 } // namespace
 } // namespace Server
diff --git a/test/server/server_test.cc b/test/server/server_test.cc
index c47df5d57c57f..abbc3690e0f5b 100644
--- a/test/server/server_test.cc
+++ b/test/server/server_test.cc
@@ -1653,7 +1653,7 @@ TEST_P(ServerInstanceImplTest, JsonApplicationLogFailWithForbiddenFlagv) {
       "setJsonLogFormat error: INVALID_ARGUMENT: Usage of %v is unavailable for JSON log formats");
 }
 
-TEST_P(ServerInstanceImplTest, JsonApplicationLogFailWithForbiddenFlag_) {
+TEST_P(ServerInstanceImplTest, JsonApplicationLogFailWithForbiddenFlagUnderscore) {
   EXPECT_THROW_WITH_MESSAGE(
       initialize("test/server/test_data/server/json_application_log_forbidden_flag_.yaml"),
       EnvoyException,