diff --git a/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/BUILD b/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/BUILD
index 4821121..5fb0fdf 100644
--- a/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/BUILD
+++ b/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/BUILD
@@ -5,12 +5,9 @@
     default_visibility = ["//plugins/code-owners:visibility"],
 )
 
-acceptance_tests(
-    srcs = glob(
-        ["*IT.java"],
-        exclude = ["Abstract*.java"],
-    ),
-    group = "acceptance_api",
+[acceptance_tests(
+    srcs = [f],
+    group = f[:f.index(".")],
     deps = [
         "testbases",
         "//plugins/code-owners:code-owners__plugin",
@@ -18,7 +15,10 @@
         "//plugins/code-owners/java/com/google/gerrit/plugins/codeowners/acceptance/testsuite",
         "//plugins/code-owners/java/com/google/gerrit/plugins/codeowners/testing",
     ],
-)
+) for f in glob(
+    ["*IT.java"],
+    exclude = ["Abstract*.java"],
+)]
 
 java_library(
     name = "testbases",
diff --git a/javatests/com/google/gerrit/plugins/codeowners/backend/BUILD b/javatests/com/google/gerrit/plugins/codeowners/backend/BUILD
index 1cea7cb..0a2c144 100644
--- a/javatests/com/google/gerrit/plugins/codeowners/backend/BUILD
+++ b/javatests/com/google/gerrit/plugins/codeowners/backend/BUILD
@@ -5,12 +5,9 @@
     default_visibility = ["//plugins/code-owners:visibility"],
 )
 
-acceptance_tests(
-    srcs = glob(
-        ["*Test.java"],
-        exclude = ["Abstract*.java"],
-    ),
-    group = "backend",
+[acceptance_tests(
+    srcs = [f],
+    group = f[:f.index(".")],
     deps = [
         ":testbases",
         "//plugins/code-owners:code-owners__plugin",
@@ -19,7 +16,10 @@
         "//plugins/code-owners/java/com/google/gerrit/plugins/codeowners/testing",
         "//plugins/code-owners/java/com/google/gerrit/plugins/codeowners/testing/backend:testutil",
     ],
-)
+) for f in glob(
+    ["*Test.java"],
+    exclude = ["Abstract*.java"],
+)]
 
 java_library(
     name = "testbases",