diff --git a/test/core/fling/BUILD b/test/core/fling/BUILD
index d1871e99648..d037142b545 100644
--- a/test/core/fling/BUILD
+++ b/test/core/fling/BUILD
@@ -47,7 +47,7 @@ grpc_cc_binary(
 )
 
 grpc_cc_test(
-    name = "fling",
+    name = "fling_test",
     srcs = ["fling_test.cc"],
     data = [
         ":fling_client",
@@ -63,7 +63,7 @@ grpc_cc_test(
 )
 
 grpc_cc_test(
-    name = "fling_stream",
+    name = "fling_stream_test",
     srcs = ["fling_stream_test.cc"],
     data = [
         ":fling_client",
diff --git a/test/core/handshake/BUILD b/test/core/handshake/BUILD
index 77ffc066ad9..24dc1431396 100644
--- a/test/core/handshake/BUILD
+++ b/test/core/handshake/BUILD
@@ -19,7 +19,7 @@ grpc_package(name = "test/core/handshake")
 licenses(["notice"])  # Apache v2
 
 grpc_cc_test(
-    name = "client_ssl",
+    name = "client_ssl_test",
     srcs = ["client_ssl.cc"],
     data = [
         "//src/core/tsi/test_creds:ca.pem",
@@ -48,7 +48,7 @@ grpc_cc_library(
 )
 
 grpc_cc_test(
-    name = "server_ssl",
+    name = "server_ssl_test",
     srcs = ["server_ssl.cc"],
     data = [
         "//src/core/tsi/test_creds:ca.pem",
@@ -66,7 +66,7 @@ grpc_cc_test(
 )
 
 grpc_cc_test(
-    name = "handshake_server_with_readahead_handshaker",
+    name = "handshake_server_with_readahead_handshaker_test",
     srcs = ["readahead_handshaker_server_ssl.cc"],
     data = [
         "//src/core/tsi/test_creds:ca.pem",
@@ -84,7 +84,7 @@ grpc_cc_test(
 )
 
 grpc_cc_test(
-    name = "handshake_verify_peer_options",
+    name = "handshake_verify_peer_options_test",
     srcs = ["verify_peer_options.cc"],
     data = [
         "//src/core/tsi/test_creds:ca.pem",
diff --git a/tools/buildgen/extract_metadata_from_bazel_xml.py b/tools/buildgen/extract_metadata_from_bazel_xml.py
index 4b647ef56c0..42d27f3cfd9 100755
--- a/tools/buildgen/extract_metadata_from_bazel_xml.py
+++ b/tools/buildgen/extract_metadata_from_bazel_xml.py
@@ -552,14 +552,6 @@ def _generate_build_extra_metadata_for_tests(tests, bazel_rules):
                     % (test_name, long_name))
                 test_metadata[test_name]['_RENAME'] = long_name
 
-    # TODO(jtattermusch): in bazel, add "_test" suffix to the test names
-    # test does not have "_test" suffix: fling
-    # test does not have "_test" suffix: fling_stream
-    # test does not have "_test" suffix: client_ssl
-    # test does not have "_test" suffix: handshake_server_with_readahead_handshaker
-    # test does not have "_test" suffix: handshake_verify_peer_options
-    # test does not have "_test" suffix: server_ssl
-
     return test_metadata