diff --git a/org.eclipse.jgit.gpg.bc.test/BUILD b/org.eclipse.jgit.gpg.bc.test/BUILD
index 99f1f0b..4c86eff 100644
--- a/org.eclipse.jgit.gpg.bc.test/BUILD
+++ b/org.eclipse.jgit.gpg.bc.test/BUILD
@@ -2,7 +2,6 @@
     "@com_googlesource_gerrit_bazlets//tools:genrule2.bzl",
     "genrule2",
 )
-load("@rules_java//java:defs.bzl", "java_import")
 load(
     "@com_googlesource_gerrit_bazlets//tools:junit.bzl",
     "junit_tests",
@@ -11,25 +10,20 @@
 junit_tests(
     name = "bc",
     srcs = glob(["tst/**/*.java"]),
+    resource_jars = [":tst_rsrc"],
     tags = ["bc"],
     deps = [
         "//lib:bcpg",
         "//lib:bcprov",
         "//lib:junit",
         "//org.eclipse.jgit.gpg.bc:gpg-bc",
-        "//org.eclipse.jgit.gpg.bc.test:tst_rsrc",
         "//org.eclipse.jgit:jgit",
     ],
 )
 
-java_import(
-    name = "tst_rsrc",
-    jars = [":tst_rsrc_jar"],
-)
-
 genrule2(
-    name = "tst_rsrc_jar",
+    name = "tst_rsrc",
     srcs = glob(["tst-rsrc/**"]),
     outs = ["tst_rsrc.jar"],
-    cmd = "o=$$PWD/$@ && tar cf - $(SRCS) | tar -C $$TMP --strip-components=2 -xf - && cd  $$TMP && zip -qr $$o .",
+    cmd = "tar cf - $(SRCS) | tar -C $$TMP --strip-components=2 -xf - && cd $$TMP && zip -qr $$ROOT/$@ .",
 )