diff --git a/BUILD b/BUILD
index 03f8e0a..94df38e 100644
--- a/BUILD
+++ b/BUILD
@@ -1,46 +1,31 @@
-load("//tools/bzl:junit.bzl", "junit_tests")
 load(
-    "//tools/bzl:plugin.bzl",
-    "PLUGIN_DEPS",
-    "PLUGIN_TEST_DEPS",
+    "@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl",
     "gerrit_plugin",
+    "gerrit_plugin_test_util",
+    "gerrit_plugin_tests",
 )
 
 gerrit_plugin(
-    name = "its-base",
+    plugin = "its-base",
     srcs = glob(["src/main/java/**/*.java"]),
     resources = glob(["src/main/resources/**/*"]),
 )
 
 TEST_UTIL_SRC = glob(["src/test/java/com/googlesource/gerrit/plugins/its/base/testutil/**/*.java"])
 
-java_library(
+gerrit_plugin_test_util(
     name = "its-base_tests-utils",
-    testonly = 1,
     srcs = TEST_UTIL_SRC,
     visibility = ["//visibility:public"],
-    deps = PLUGIN_DEPS + PLUGIN_TEST_DEPS,
 )
 
-junit_tests(
+gerrit_plugin_tests(
     name = "its_base_tests",
-    testonly = 1,
     srcs = glob(
         ["src/test/java/**/*.java"],
         exclude = TEST_UTIL_SRC,
     ),
+    plugin = "its-base",
     tags = ["its-base"],
-    deps = [
-        "its-base__plugin_test_deps",
-    ],
-)
-
-java_library(
-    name = "its-base__plugin_test_deps",
-    testonly = 1,
-    visibility = ["//visibility:public"],
-    exports = PLUGIN_DEPS + PLUGIN_TEST_DEPS + [
-        ":its-base__plugin",
-        ":its-base_tests-utils",
-    ],
-)
+    deps = [":its-base_tests-utils"],
+)
\ No newline at end of file