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],
-)
diff --git a/utils/misc/BUCK b/utils/misc/BUCK
index e04682b..73e4917 100644
--- a/utils/misc/BUCK
+++ b/utils/misc/BUCK
@@ -1,29 +1,12 @@
-SRC = 'src/main/java/org/onlab/**/'
-TEST = 'src/test/java/org/onlab/**/'
-CURRENT_NAME = 'onlab-misc'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
 COMPILE_DEPS = [
     '//lib:COMPILE',
 ]
 
-TEST_DEPS = [
-    '//lib:TEST',
-]
-
-osgi_jar(
-    name = CURRENT_NAME,
-    srcs = glob([SRC + '/*.java']),
+osgi_jar_with_tests(
+    name = 'onlab-misc',
     deps = COMPILE_DEPS,
-    visibility = ['PUBLIC'],
     package_name_root = 'org.onlab',
+    visibility = ['PUBLIC'],
 )
 
-java_test(
-    name = 'tests',
-    srcs = glob([TEST + '/*.java']),
-    deps = COMPILE_DEPS +
-           TEST_DEPS +
-           [CURRENT_TARGET],
-)
 
diff --git a/utils/osgi/BUCK b/utils/osgi/BUCK
index 7ffe40f..36d5819 100644
--- a/utils/osgi/BUCK
+++ b/utils/osgi/BUCK
@@ -1,29 +1,9 @@
-SRC = 'src/main/java/org/onlab/osgi/'
-TEST = 'src/test/java/org/onlab/osgi/'
-CURRENT_NAME = 'onlab-osgi'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
 COMPILE_DEPS = [
     '//lib:COMPILE',
 ]
 
-TEST_DEPS = [
-    '//lib:TEST',
-]
-
-osgi_jar(
-  name = CURRENT_NAME,
-  srcs = glob([SRC + '/*.java']),
+osgi_jar_with_tests(
+  name = 'onlab-osgi',
   deps = COMPILE_DEPS,
-  visibility = ['PUBLIC'],
   package_name_root = 'org.onlab',
 )
-
-java_test(
-  name = 'onlab-osgi-tests',
-  srcs = glob([TEST + '/*.java']),
-  deps = COMPILE_DEPS +
-         TEST_DEPS +
-         [CURRENT_TARGET],
-  visibility = ['PUBLIC'],
-)