diff --git a/web/api/BUCK b/web/api/BUCK
index 2b1d0fb..f74f488 100644
--- a/web/api/BUCK
+++ b/web/api/BUCK
@@ -1,10 +1,3 @@
-SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/test/java/org/onosproject/**/'
-RESOURCES_ROOT = 'src/main/resources/'
-
-CURRENT_NAME = 'onos-rest'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//incubator/api:onos-incubator-api',
@@ -16,26 +9,9 @@
     '//lib:TEST_REST',
 ]
 
-osgi_jar(
-    name = CURRENT_NAME,
-    srcs = glob([SRC + '/*.java']),
-    resources = glob([RESOURCES_ROOT + '**']),
-    resources_root = RESOURCES_ROOT,
+osgi_jar_with_tests (
+    name = 'onos-rest',
     deps = COMPILE_DEPS,
-    visibility = ['PUBLIC'],
-    debug = False,
-    web_context = '/onos/v1'
-)
-
-SOURCE_JAR = CURRENT_TARGET + '-jar'
-java_test(
-    name = 'onos-rest-tests',
-    srcs = glob([TEST + '/*.java']),
-    deps = COMPILE_DEPS +
-           TEST_DEPS +
-           [SOURCE_JAR],
-    source_under_test = [SOURCE_JAR],
-    visibility = ['PUBLIC'],
-    resources_root = 'src/test/resources',
-    resources = glob(['src/test/resources/**']),
-)
+    test_deps = TEST_DEPS,
+    web_context = '/onos/v1',
+)
\ No newline at end of file
diff --git a/web/gui/BUCK b/web/gui/BUCK
index b1a9a7c..7230898 100644
--- a/web/gui/BUCK
+++ b/web/gui/BUCK
@@ -1,10 +1,3 @@
-SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/test/java/org/onosproject/**/'
-RESOURCES_ROOT = 'src/main/resources/'
-
-CURRENT_NAME = 'onos-gui'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//lib:javax.ws.rs-api',
@@ -33,23 +26,10 @@
     'WEB-INF/classes/raw=src/main/webapp/raw',
 ]
 
-osgi_jar(
-    name = CURRENT_NAME,
-    srcs = glob([SRC + '/*.java']),
-    resources = glob([RESOURCES_ROOT + '**']),
-    resources_root = RESOURCES_ROOT,
+osgi_jar_with_tests (
+    name = 'onos-gui',
     deps = COMPILE_DEPS,
-    visibility = ['PUBLIC'],
+    test_deps = TEST_DEPS,
     include_resources = ','.join(RESOURCES),
     web_context = '/onos/ui',
-    debug = False,
-)
-
-java_test(
-    name = 'tests',
-    srcs = glob([TEST + '/*.java']),
-    deps = COMPILE_DEPS +
-           TEST_DEPS +
-           [CURRENT_TARGET],
-    source_under_test = [CURRENT_TARGET],
 )