diff --git a/lib/BUILD b/lib/BUILD
index 827e6b6fc..ffe66a3d8 100644
--- a/lib/BUILD
+++ b/lib/BUILD
@@ -115,9 +115,9 @@ java_library(
     testonly = 1,
     visibility = ["//visibility:public"],
     exports = [
-       "@junit//jar",
-       "@hamcrest_core//jar",
-       "@hamcrest_library//jar",
+        "@hamcrest_core//jar",
+        "@hamcrest_library//jar",
+        "@junit//jar",
     ],
 )
 
diff --git a/org.eclipse.jgit.test/BUILD b/org.eclipse.jgit.test/BUILD
index ae6f24223..bbda838f0 100644
--- a/org.eclipse.jgit.test/BUILD
+++ b/org.eclipse.jgit.test/BUILD
@@ -33,7 +33,7 @@ DATA = [
 
 tests(glob(
     ["tst/**/*.java"],
-    exclude = HELPERS + DATA
+    exclude = HELPERS + DATA,
 ))
 
 java_library(
@@ -54,8 +54,8 @@ java_import(
 )
 
 genrule2(
-  name = 'tst_rsrc_jar',
-  cmd = 'o=$$PWD/$@ && tar cf - $(SRCS) | tar -C $$TMP --strip-components=2 -xf - && cd  $$TMP && zip -qr $$o .',
-  srcs = glob(['tst-rsrc/**']),
-  outs = ['tst_rsrc.jar',],
+    name = "tst_rsrc_jar",
+    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 .",
 )