diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml
index fba96587505..f04589c8da8 100644
--- a/build_autogenerated.yaml
+++ b/build_autogenerated.yaml
@@ -5410,7 +5410,6 @@ targets:
 - name: dns_resolver_cooldown_test
   gtest: true
   build: test
-  run: false
   language: c++
   headers: []
   src:
@@ -6815,6 +6814,7 @@ targets:
 - name: grpc_tls_credentials_options_test
   gtest: true
   build: test
+  run: false
   language: c++
   headers:
   - test/core/util/cmdline.h
diff --git a/test/core/client_channel/resolvers/BUILD b/test/core/client_channel/resolvers/BUILD
index 2717ff5e69b..834d69ed164 100644
--- a/test/core/client_channel/resolvers/BUILD
+++ b/test/core/client_channel/resolvers/BUILD
@@ -49,7 +49,6 @@ grpc_cc_test(
     name = "dns_resolver_cooldown_test",
     srcs = ["dns_resolver_cooldown_test.cc"],
     external_deps = ["gtest"],
-    flaky = True,
     language = "C++",
     deps = [
         "//:gpr",
diff --git a/test/core/end2end/flaky.bzl b/test/core/end2end/flaky.bzl
index 867d60ead26..327a03a46af 100644
--- a/test/core/end2end/flaky.bzl
+++ b/test/core/end2end/flaky.bzl
@@ -24,6 +24,8 @@ FLAKY_TESTS = [
     "h2_compress_test@max_connection_age",
     "h2_compress_test@max_connection_idle",
     "h2_compress_test@retry_cancellation",
+    "h2_compress_test@retry_per_attempt_recv_timeout",
+    "h2_fakesec_test@max_connection_idle",
     "h2_fakesec_test@retry_per_attempt_recv_timeout",
     "h2_fakesec_test@retry_server_pushback_disabled",
     "h2_fakesec_test@retry_too_many_attempts",
@@ -56,14 +58,13 @@ FLAKY_TESTS = [
     "h2_insecure_test@max_connection_age",
     "h2_insecure_test@max_connection_idle",
     "h2_insecure_test@retry",
-    "h2_insecure_test@retry_send_initial_metadata_refs",
     "h2_insecure_test@retry_server_pushback_disabled",
     "h2_local_abstract_uds_percent_encoded_test@max_connection_idle",
     "h2_local_ipv4_test@bad_ping",
     "h2_local_ipv4_test@max_connection_idle",
     "h2_local_ipv4_test@retry",
     "h2_local_ipv4_test@retry_per_attempt_recv_timeout",
-    "h2_local_ipv4_test@retry_send_initial_metadata_refs",
+    "h2_local_ipv4_test@retry_server_pushback_delay",
     "h2_local_ipv4_test@retry_streaming2",
     "h2_local_ipv6_test@bad_ping",
     "h2_local_ipv6_test@cancel_after_accept",
@@ -74,6 +75,7 @@ FLAKY_TESTS = [
     "h2_local_uds_percent_encoded_test@bad_ping",
     "h2_local_uds_percent_encoded_test@connectivity",
     "h2_local_uds_percent_encoded_test@max_connection_idle",
+    "h2_local_uds_percent_encoded_test@ping",
     "h2_local_uds_percent_encoded_test@retry_per_attempt_recv_timeout",
     "h2_local_uds_percent_encoded_test@retry_streaming2",
     "h2_local_uds_percent_encoded_test@retry_transparent_mcs",
@@ -88,7 +90,6 @@ FLAKY_TESTS = [
     "h2_oauth2_test@grpc_authz",
     "h2_oauth2_test@max_connection_age",
     "h2_oauth2_test@max_connection_idle",
-    "h2_oauth2_test@retry_server_pushback_delay",
     "h2_oauth2_test@retry_server_pushback_disabled",
     "h2_oauth2_test@retry_too_many_attempts",
     "h2_proxy_test@grpc_authz",
@@ -107,10 +108,11 @@ FLAKY_TESTS = [
     "h2_ssl_cred_reload_test@retry_server_pushback_delay",
     "h2_ssl_cred_reload_test@retry_too_many_attempts",
     "h2_ssl_cred_reload_test@simple_delayed_request",
+    "h2_ssl_cred_reload_tls12_test@retry_server_pushback_delay",
+    "h2_ssl_cred_reload_tls12_test@retry_too_many_attempts",
     "h2_ssl_proxy_test@disappearing_server",
-    "h2_ssl_proxy_test@retry_cancellation",
+    "h2_ssl_proxy_test@retry_exceeds_buffer_size_in_delay",
     "h2_ssl_proxy_test@retry_server_pushback_delay",
-    "h2_ssl_proxy_test@retry_too_many_attempts",
     "h2_ssl_proxy_test@shutdown_finishes_calls",
     "h2_ssl_test@bad_ping",
     "h2_ssl_test@compressed_payload",
@@ -145,6 +147,7 @@ FLAKY_TESTS = [
     "h2_tls_static_async_tls1_3_test@max_connection_idle",
     "h2_tls_static_async_tls1_3_test@retry_cancellation",
     "h2_tls_static_async_tls1_3_test@retry_per_attempt_recv_timeout",
+    "h2_tls_static_async_tls1_3_test@retry_server_pushback_delay",
     "h2_tls_static_async_tls1_3_test@simple_delayed_request",
     "h2_tls_test@bad_ping",
     "h2_tls_test@connectivity",
diff --git a/test/core/security/BUILD b/test/core/security/BUILD
index 019e66680af..161ca4bd697 100644
--- a/test/core/security/BUILD
+++ b/test/core/security/BUILD
@@ -354,6 +354,7 @@ grpc_cc_test(
         "//src/core/tsi/test_creds:server1.pem",
     ],
     external_deps = ["gtest"],
+    flaky = True,
     language = "C++",
     deps = [
         "//:gpr",
diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json
index 890c85a1fba..b841ee8cc5e 100644
--- a/tools/run_tests/generated/tests.json
+++ b/tools/run_tests/generated/tests.json
@@ -2375,6 +2375,30 @@
     ],
     "uses_polling": true
   },
+  {
+    "args": [],
+    "benchmark": false,
+    "ci_platforms": [
+      "linux",
+      "mac",
+      "posix",
+      "windows"
+    ],
+    "cpu_cost": 1.0,
+    "exclude_configs": [],
+    "exclude_iomgrs": [],
+    "flaky": false,
+    "gtest": true,
+    "language": "c++",
+    "name": "dns_resolver_cooldown_test",
+    "platforms": [
+      "linux",
+      "mac",
+      "posix",
+      "windows"
+    ],
+    "uses_polling": true
+  },
   {
     "args": [],
     "benchmark": false,
@@ -3395,30 +3419,6 @@
     ],
     "uses_polling": true
   },
-  {
-    "args": [],
-    "benchmark": false,
-    "ci_platforms": [
-      "linux",
-      "mac",
-      "posix",
-      "windows"
-    ],
-    "cpu_cost": 1.0,
-    "exclude_configs": [],
-    "exclude_iomgrs": [],
-    "flaky": false,
-    "gtest": true,
-    "language": "c++",
-    "name": "grpc_tls_credentials_options_test",
-    "platforms": [
-      "linux",
-      "mac",
-      "posix",
-      "windows"
-    ],
-    "uses_polling": true
-  },
   {
     "args": [],
     "benchmark": false,