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],
-)