diff --git a/utils/junit/BUCK b/utils/junit/BUCK
index b251ae1..c2fea21 100644
--- a/utils/junit/BUCK
+++ b/utils/junit/BUCK
@@ -1,8 +1,3 @@
-SRC = 'src/main/java/org/onlab/junit/'
-TEST = 'src/test/java/org/onlab/junit/'
-CURRENT_NAME = 'onlab-junit'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
 SRC_DEPS = [
     '//lib:junit',
     '//lib:hamcrest-all',
@@ -13,20 +8,13 @@
     '//lib:guava-testlib',
 ]
 
-osgi_jar(
-    name = CURRENT_NAME,
+osgi_jar_with_tests(
+    name = 'onlab-junit',
     srcs = glob([SRC + '/*.java']),
     deps = SRC_DEPS,
+    test_deps = TEST_DEPS,
     visibility = ['PUBLIC'],
     resources_root = 'src/main/resources',
     resources = glob(['src/main/resources/**']),
     package_name_root = 'org.onlab',
 )
-
-java_test(
-    name = 'tests',
-    srcs = glob([TEST + '/*.java']),
-    deps = SRC_DEPS +
-           TEST_DEPS +
-           [CURRENT_TARGET],
-)