diff --git a/gerrit-acceptance-tests/tests.bzl b/gerrit-acceptance-tests/tests.bzl
index 160234f..cd1e7ec 100644
--- a/gerrit-acceptance-tests/tests.bzl
+++ b/gerrit-acceptance-tests/tests.bzl
@@ -7,16 +7,12 @@
 
 def acceptance_tests(
     group,
-    srcs,
-    flaky = 0,
     deps = [],
     labels = [],
     vm_args = ['-Xmx256m'],
     **kwargs):
   junit_tests(
     name = group,
-    srcs = srcs,
-    flaky = flaky,
     deps = deps + BOUNCYCASTLE + [
       '//gerrit-acceptance-tests:lib',
     ],
@@ -24,6 +20,7 @@
       'acceptance',
       'slow',
     ],
+    size = "medium",
     jvm_flags = vm_args,
     **kwargs
   )
diff --git a/gerrit-elasticsearch/BUILD b/gerrit-elasticsearch/BUILD
index bb1f0e2..b8cfaa1 100644
--- a/gerrit-elasticsearch/BUILD
+++ b/gerrit-elasticsearch/BUILD
@@ -35,6 +35,7 @@
   name = 'elasticsearch_tests',
   tags = ['elastic', 'flaky'],
   srcs = glob(['src/test/java/**/*.java']),
+  size = "medium",
   deps = [
     ':elasticsearch',
     '//gerrit-extension-api:api',
diff --git a/gerrit-server/BUILD b/gerrit-server/BUILD
index de6a06c..d410865 100644
--- a/gerrit-server/BUILD
+++ b/gerrit-server/BUILD
@@ -191,6 +191,7 @@
 junit_tests(
   name = 'query_tests',
   srcs = QUERY_TESTS,
+  size = "medium",
   deps = TESTUTIL_DEPS + [
     ':testutil',
     '//gerrit-antlr:query_exception',
@@ -209,6 +210,7 @@
     exclude = TESTUTIL + PROLOG_TESTS + PROLOG_TEST_CASE + QUERY_TESTS
   ),
   resources = glob(['src/test/resources/com/google/gerrit/server/mail/*']),
+  size = "medium",
   deps = TESTUTIL_DEPS + [
     ':testutil',
     '//gerrit-antlr:query_exception',