diff --git a/incubator/api/BUCK b/incubator/api/BUCK
index e1d3ede..ac2ce6c 100644
--- a/incubator/api/BUCK
+++ b/incubator/api/BUCK
@@ -8,7 +8,7 @@
 ]
 
 TEST_DEPS = [
-    '//lib:TEST',
+    '//lib:TEST_ADAPTERS',
 ]
 
 osgi_jar(
@@ -19,10 +19,11 @@
 )
 
 java_test(
-    name = 'tests',
+    name = 'onos-incubator-api-tests',
     srcs = glob([TEST + '/*.java']),
     deps = COMPILE_DEPS +
            TEST_DEPS +
            [CURRENT_TARGET],
     source_under_test = [CURRENT_TARGET],
+    visibility = ['PUBLIC'],
 )
diff --git a/incubator/net/BUCK b/incubator/net/BUCK
index 430f32d..28ee974 100644
--- a/incubator/net/BUCK
+++ b/incubator/net/BUCK
@@ -9,7 +9,11 @@
 ]
 
 TEST_DEPS = [
-    '//lib:TEST',
+    '//lib:TEST_ADAPTERS',
+    '//core/api:onos-api-tests',
+    '//core/common:onos-core-common-tests',
+    '//incubator/store:onos-incubator-store',
+    '//core/store/serializers:onos-core-serializers',
 ]
 
 osgi_jar(
diff --git a/incubator/store/BUCK b/incubator/store/BUCK
index afc1908..d117f29 100644
--- a/incubator/store/BUCK
+++ b/incubator/store/BUCK
@@ -1,5 +1,5 @@
-SRC = 'src/main/java/org/onosproject/incubator/**/'
-TEST = 'src/test/java/org/onosproject/incubator/**/'
+SRC = 'src/main/java/org/onosproject/incubator/store/**/'
+TEST = 'src/test/java/org/onosproject/incubator/store/**/'
 CURRENT_NAME = 'onos-incubator-store'
 CURRENT_TARGET = ':' + CURRENT_NAME
 
@@ -12,7 +12,9 @@
 ]
 
 TEST_DEPS = [
-    '//lib:TEST',
+    '//lib:TEST_ADAPTERS',
+    '//core/api:onos-api-tests',
+    '//core/common:onos-core-common-tests',
 ]
 
 osgi_jar(