diff --git a/javatests/com/google/gerrit/acceptance/pgm/BUILD b/javatests/com/google/gerrit/acceptance/pgm/BUILD
index e8cf516..e0ed78a 100644
--- a/javatests/com/google/gerrit/acceptance/pgm/BUILD
+++ b/javatests/com/google/gerrit/acceptance/pgm/BUILD
@@ -26,7 +26,6 @@
         "docker",
         "elastic",
         "exclusive",
-        "flaky",
         "pgm",
         "no_windows",
     ],
diff --git a/javatests/com/google/gerrit/elasticsearch/BUILD b/javatests/com/google/gerrit/elasticsearch/BUILD
index 4806acc..c586080 100644
--- a/javatests/com/google/gerrit/elasticsearch/BUILD
+++ b/javatests/com/google/gerrit/elasticsearch/BUILD
@@ -65,7 +65,7 @@
     name = "elasticsearch_query_%ss_test_V6" % name,
     size = "large",
     srcs = [src],
-    tags = ELASTICSEARCH_TAGS + ["flaky"],
+    tags = ELASTICSEARCH_TAGS,
     deps = ELASTICSEARCH_DEPS + [QUERY_TESTS_DEP % name],
 ) for name, src in ELASTICSEARCH_TESTS_V6.items()]
 
@@ -73,7 +73,7 @@
     name = "elasticsearch_query_%ss_test_V7" % name,
     size = "large",
     srcs = [src],
-    tags = ELASTICSEARCH_TAGS + ["flaky"],
+    tags = ELASTICSEARCH_TAGS,
     deps = ELASTICSEARCH_DEPS + [QUERY_TESTS_DEP % name] + [
         "//lib/httpcomponents:httpasyncclient",
         "//lib/httpcomponents:httpclient",