diff --git a/Makefile b/Makefile
index 13a28b9797c51d936edc8bfa3c2c46b2930a83f1..8138f1adf31ae67511add1e59f04a14be9e8b9d2 100644
--- a/Makefile
+++ b/Makefile
@@ -1886,8 +1886,6 @@ test_cxx: buildtests_cxx
 	$(Q) $(BINDIR)/$(CONFIG)/grpclb_api_test || ( echo test grpclb_api_test failed ; exit 1 )
 	$(E) "[RUN]     Testing grpclb_test"
 	$(Q) $(BINDIR)/$(CONFIG)/grpclb_test || ( echo test grpclb_test failed ; exit 1 )
-	$(E) "[RUN]     Testing hybrid_end2end_test"
-	$(Q) $(BINDIR)/$(CONFIG)/hybrid_end2end_test || ( echo test hybrid_end2end_test failed ; exit 1 )
 	$(E) "[RUN]     Testing interop_test"
 	$(Q) $(BINDIR)/$(CONFIG)/interop_test || ( echo test interop_test failed ; exit 1 )
 	$(E) "[RUN]     Testing mock_test"
@@ -1923,6 +1921,8 @@ test_cxx: buildtests_cxx
 
 
 flaky_test_cxx: buildtests_cxx
+	$(E) "[RUN]     Testing hybrid_end2end_test"
+	$(Q) $(BINDIR)/$(CONFIG)/hybrid_end2end_test || ( echo test hybrid_end2end_test failed ; exit 1 )
 
 
 test_python: static_c
diff --git a/build.yaml b/build.yaml
index 5f6e0bbfdd9f21f28c87c039c1246289331375a8..96f27679f4cd759bd787bc0b528d440953a3b530 100644
--- a/build.yaml
+++ b/build.yaml
@@ -3288,7 +3288,7 @@ targets:
   - linux
   - posix
 - name: hybrid_end2end_test
-  gtest: true
+  flaky: true
   build: test
   language: c++
   src:
diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json
index 5c72bc96a50f8e15dd05dc6c90dc562dca041a96..fb7a72c4ff3bf7255e12706f32a4bbaac059ce8d 100644
--- a/tools/run_tests/generated/tests.json
+++ b/tools/run_tests/generated/tests.json
@@ -2856,8 +2856,8 @@
     "cpu_cost": 1.0, 
     "exclude_configs": [], 
     "exclude_iomgrs": [], 
-    "flaky": false, 
-    "gtest": true, 
+    "flaky": true, 
+    "gtest": false, 
     "language": "c++", 
     "name": "hybrid_end2end_test", 
     "platforms": [