diff --git a/org.eclipse.jgit.test/BUILD b/org.eclipse.jgit.test/BUILD
index ac8c1914f..b06778eed 100644
--- a/org.eclipse.jgit.test/BUILD
+++ b/org.eclipse.jgit.test/BUILD
@@ -30,7 +30,7 @@ DATA = [
     PKG + "lib/sorttest.gitindex.dat",
 ]
 
-tests(glob(
+tests(tests = glob(
     ["tst/**/*.java"],
     exclude = HELPERS + DATA,
 ))
diff --git a/org.eclipse.jgit.test/tests.bzl b/org.eclipse.jgit.test/tests.bzl
index 4963ecf9f..7ff90d484 100644
--- a/org.eclipse.jgit.test/tests.bzl
+++ b/org.eclipse.jgit.test/tests.bzl
@@ -8,14 +8,14 @@ def tests(tests):
         name = src[len("tst/"):len(src) - len(".java")].replace("/", "_")
         labels = []
         if name.startswith("org_eclipse_jgit_"):
-            l = name[len("org.eclipse.jgit_"):]
-            if l.startswith("internal_storage_"):
-                l = l[len("internal.storage_"):]
-            i = l.find("_")
-            if i > 0:
-                labels.append(l[:i])
+            package = name[len("org.eclipse.jgit_"):]
+            if package.startswith("internal_storage_"):
+                package = package[len("internal.storage_"):]
+            index = package.find("_")
+            if index > 0:
+                labels.append(package[:index])
             else:
-                labels.append(i)
+                labels.append(index)
         if "lib" not in labels:
             labels.append("lib")