diff --git a/bazel/experiments.bzl b/bazel/experiments.bzl
index 9554efd78c4..609d72f0779 100644
--- a/bazel/experiments.bzl
+++ b/bazel/experiments.bzl
@@ -17,12 +17,6 @@
 """Dictionary of tags to experiments so we know when to test different experiments."""
 
 EXPERIMENTS = {
-    "core_end2end_test": [
-        "flow_control_fixes",
-        "tcp_frame_size_tuning",
-        "tcp_rcv_lowat",
-        "tcp_read_chunks",
-    ],
     "endpoint_test": [
         "tcp_frame_size_tuning",
         "tcp_rcv_lowat",
@@ -30,6 +24,9 @@ EXPERIMENTS = {
     ],
     "flow_control_test": [
         "flow_control_fixes",
+        "tcp_frame_size_tuning",
+        "tcp_rcv_lowat",
+        "tcp_read_chunks",
     ],
     "resource_quota_test": [
         "memory_pressure_controller",
diff --git a/src/core/lib/experiments/experiments.yaml b/src/core/lib/experiments/experiments.yaml
index 461150c544d..d5351abf9ac 100644
--- a/src/core/lib/experiments/experiments.yaml
+++ b/src/core/lib/experiments/experiments.yaml
@@ -35,7 +35,7 @@
   default: false
   expiry: 2022/10/01
   owner: ctiller@google.com
-  test_tags: ["endpoint_test", "core_end2end_test"]
+  test_tags: ["endpoint_test", "flow_control_test"]
 - name: tcp_read_chunks
   description:
     Allocate only 8kb or 64kb chunks for TCP reads to reduce pressure on
@@ -43,21 +43,21 @@
   default: false
   expiry: 2022/10/01
   owner: ctiller@google.com
-  test_tags: ["endpoint_test", "core_end2end_test"]
+  test_tags: ["endpoint_test", "flow_control_test"]
 - name: tcp_rcv_lowat
   description:
     Use SO_RCVLOWAT to avoid wakeups on the read path.
   default: false
   expiry: 2022/10/01
   owner: ctiller@google.com
-  test_tags: ["endpoint_test", "core_end2end_test"]
+  test_tags: ["endpoint_test", "flow_control_test"]
 - name: flow_control_fixes
   description:
     Various fixes for flow control, max frame size setting.
   default: false
   expiry: 2022/10/01
   owner: ctiller@google.com
-  test_tags: ["core_end2end_test", "flow_control_test"]
+  test_tags: ["flow_control_test"]
 - name: memory_pressure_controller
   description:
     New memory pressure controller
diff --git a/test/core/end2end/generate_tests.bzl b/test/core/end2end/generate_tests.bzl
index 249e98b1859..5ba8137cc15 100755
--- a/test/core/end2end/generate_tests.bzl
+++ b/test/core/end2end/generate_tests.bzl
@@ -171,6 +171,7 @@ def _test_options(
         needs_client_channel = False,
         needs_retry = False,
         short_name = None,
+        tags = [],
         exclude_pollers = []):
     return struct(
         needs_fullstack = needs_fullstack,
@@ -187,6 +188,7 @@ def _test_options(
         needs_client_channel = needs_client_channel,
         needs_retry = needs_retry,
         short_name = short_name,
+        tags = tags,
         exclude_pollers = exclude_pollers,
     )
 
@@ -241,7 +243,7 @@ END2END_TESTS = {
         exclude_inproc = True,
     ),
     "high_initial_seqno": _test_options(),
-    "invoke_large_request": _test_options(exclude_1byte = True),
+    "invoke_large_request": _test_options(exclude_1byte = True, tags = ["flow_control_test"]),
     "keepalive_timeout": _test_options(proxyable = False, needs_http2 = True),
     "large_metadata": _test_options(exclude_1byte = True),
     "max_concurrent_streams": _test_options(
@@ -260,7 +262,7 @@ END2END_TESTS = {
     # end2end_tests.cc, which are not generated because they would depend on OpenCensus while
     # OpenCensus can only be built via Bazel so far.
     # 'load_reporting_hook': _test_options(),
-    "ping_pong_streaming": _test_options(),
+    "ping_pong_streaming": _test_options(tags = ["flow_control_test"]),
     "ping": _test_options(needs_fullstack = True, proxyable = False),
     "proxy_auth": _test_options(needs_proxy_auth = True),
     "registered_call": _test_options(),
@@ -471,7 +473,7 @@ def grpc_end2end_tests():
                 srcs = ["run.sh"],
                 data = [":" + bin_name],
                 args = ["$(location %s)" % bin_name, t],
-                tags = _platform_support_tags(fopt) + fopt.tags + [
+                tags = _platform_support_tags(fopt) + fopt.tags + topt.tags + [
                     "no_test_ios",
                     "core_end2end_test",
                 ],