diff --git a/drivers/utilities/BUCK b/drivers/utilities/BUCK
index 80ec633..731ad13 100644
--- a/drivers/utilities/BUCK
+++ b/drivers/utilities/BUCK
@@ -1,34 +1,11 @@
-SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/test/java/org/onosproject/**/'
-CURRENT_NAME = 'onos-drivers-utilities'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//core/net:onos-core-net',
 ]
 
-TEST_DEPS = [
-    '//lib:TEST',
-]
-
-osgi_jar(
-    name = CURRENT_NAME,
-    srcs = glob([SRC + '/*.java']),
+osgi_jar_with_tests (
     deps = COMPILE_DEPS,
-    visibility = ['PUBLIC'],
     resources_root = 'src/main/resources',
     resources = glob(['src/main/resources/**']),
 )
 
-java_test(
-    name = 'onos-drivers-utilities-tests',
-    visibility = ['PUBLIC'],
-    resources_root = 'src/test/resources',
-    resources = glob(['src/test/resources/**']),
-    srcs = glob([TEST + '/*.java']),
-    deps = COMPILE_DEPS +
-           TEST_DEPS +
-           [CURRENT_TARGET],
-    source_under_test = [CURRENT_TARGET],
-)