diff --git a/apps/aaa/BUCK b/apps/aaa/BUCK
index 160c420..fdccf43 100644
--- a/apps/aaa/BUCK
+++ b/apps/aaa/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-app-aaa'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/apps/acl/BUCK b/apps/acl/BUCK
index 72f4eb4..1ee2411 100644
--- a/apps/acl/BUCK
+++ b/apps/acl/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-app-acl'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/apps/bgprouter/BUCK b/apps/bgprouter/BUCK
index dcf4c8b..3d39bc1 100644
--- a/apps/bgprouter/BUCK
+++ b/apps/bgprouter/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-app-bgprouter'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/apps/cip/BUCK b/apps/cip/BUCK
index dbaa33b..aba9512 100644
--- a/apps/cip/BUCK
+++ b/apps/cip/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-app-cip'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/apps/cordmcast/BUCK b/apps/cordmcast/BUCK
index 0b61f99..4da724a 100644
--- a/apps/cordmcast/BUCK
+++ b/apps/cordmcast/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-app-cord-mcast'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/apps/cordvtn/BUCK b/apps/cordvtn/BUCK
index 5ceb313..27ca9ce 100644
--- a/apps/cordvtn/BUCK
+++ b/apps/cordvtn/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-app-cordvtn'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/apps/cpman/api/BUCK b/apps/cpman/api/BUCK
index 293e8c2..fb4f6f5 100644
--- a/apps/cpman/api/BUCK
+++ b/apps/cpman/api/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-app-cpman-api'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/apps/cpman/app/BUCK b/apps/cpman/app/BUCK
index 728ad44..c23153e 100644
--- a/apps/cpman/app/BUCK
+++ b/apps/cpman/app/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-app-cpman-app'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/apps/dhcp/api/BUCK b/apps/dhcp/api/BUCK
index eaa368b..e86c13b 100644
--- a/apps/dhcp/api/BUCK
+++ b/apps/dhcp/api/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-app-dhcp-api'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/apps/dhcp/app/BUCK b/apps/dhcp/app/BUCK
index e11bea9..9449e44 100644
--- a/apps/dhcp/app/BUCK
+++ b/apps/dhcp/app/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-app-dhcp-app'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/apps/drivermatrix/BUCK b/apps/drivermatrix/BUCK
index d8ac3bb..0dccec6 100644
--- a/apps/drivermatrix/BUCK
+++ b/apps/drivermatrix/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-app-drivermatrix'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/apps/events/BUCK b/apps/events/BUCK
index e3ec6cf..c7049a6 100644
--- a/apps/events/BUCK
+++ b/apps/events/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-app-events'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/apps/faultmanagement/BUCK b/apps/faultmanagement/BUCK
index 7dd4252..f837268 100644
--- a/apps/faultmanagement/BUCK
+++ b/apps/faultmanagement/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
diff --git a/apps/flowanalyzer/BUCK b/apps/flowanalyzer/BUCK
index e377f7c..c7ef685 100644
--- a/apps/flowanalyzer/BUCK
+++ b/apps/flowanalyzer/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-app-flowanalyzer'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/apps/fwd/BUCK b/apps/fwd/BUCK
index 62529ce..6a2fac0 100644
--- a/apps/fwd/BUCK
+++ b/apps/fwd/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-app-fwd'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/apps/gangliametrics/BUCK b/apps/gangliametrics/BUCK
index add0997..3336db7 100644
--- a/apps/gangliametrics/BUCK
+++ b/apps/gangliametrics/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-app-ganglia'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/apps/graphitemetrics/BUCK b/apps/graphitemetrics/BUCK
index 01083ca..aa0a1f6 100644
--- a/apps/graphitemetrics/BUCK
+++ b/apps/graphitemetrics/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-app-graphite'
 CURRENT_TARGET = ':' + CURRENT_NAME
@@ -12,6 +12,7 @@
 
 TEST_DEPS = [
     '//lib:TEST',
+    '//core/api:onos-api',
 ]
 
 java_library(
diff --git a/apps/igmp/BUCK b/apps/igmp/BUCK
index c298964..4f7a70f 100644
--- a/apps/igmp/BUCK
+++ b/apps/igmp/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-app-igmp'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/apps/influxdbmetrics/BUCK b/apps/influxdbmetrics/BUCK
index 0847bb7..5fdf08f 100644
--- a/apps/influxdbmetrics/BUCK
+++ b/apps/influxdbmetrics/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-app-influxdb'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/apps/iptopology-api/BUCK b/apps/iptopology-api/BUCK
index 79a4146..d51b6a8 100644
--- a/apps/iptopology-api/BUCK
+++ b/apps/iptopology-api/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-app-iptopology-api'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/apps/metrics/BUCK b/apps/metrics/BUCK
index ad1b452..eb607f1 100644
--- a/apps/metrics/BUCK
+++ b/apps/metrics/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-app-metrics'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/apps/mfwd/BUCK b/apps/mfwd/BUCK
index 46730ef..64f3755 100644
--- a/apps/mfwd/BUCK
+++ b/apps/mfwd/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-app-mfwd'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/apps/mlb/BUCK b/apps/mlb/BUCK
index dc45bb0..e1a2d53 100644
--- a/apps/mlb/BUCK
+++ b/apps/mlb/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-app-mlb'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/apps/mobility/BUCK b/apps/mobility/BUCK
index 4adca9f..1e39b6d 100644
--- a/apps/mobility/BUCK
+++ b/apps/mobility/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-app-mobility'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/apps/olt/BUCK b/apps/olt/BUCK
index a626006..33cfd41 100644
--- a/apps/olt/BUCK
+++ b/apps/olt/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
diff --git a/apps/openstackinterface/BUCK b/apps/openstackinterface/BUCK
index a43ca84..9a1d458 100644
--- a/apps/openstackinterface/BUCK
+++ b/apps/openstackinterface/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
diff --git a/apps/openstacknetworking/BUCK b/apps/openstacknetworking/BUCK
index 65b6acc..73babee 100644
--- a/apps/openstacknetworking/BUCK
+++ b/apps/openstacknetworking/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
diff --git a/apps/openstacknode/BUCK b/apps/openstacknode/BUCK
index 856dc7e..37680a8 100644
--- a/apps/openstacknode/BUCK
+++ b/apps/openstacknode/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-app-openstacknode'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/apps/optical/BUCK b/apps/optical/BUCK
index 33a5615..62512c3 100644
--- a/apps/optical/BUCK
+++ b/apps/optical/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-app-optical'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/apps/pathpainter/BUCK b/apps/pathpainter/BUCK
index 99cbcb6..4debeb7 100644
--- a/apps/pathpainter/BUCK
+++ b/apps/pathpainter/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-app-pp'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/apps/pcep-api/BUCK b/apps/pcep-api/BUCK
index 4b78c47..1b57c89 100644
--- a/apps/pcep-api/BUCK
+++ b/apps/pcep-api/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-app-pcep-api'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/apps/pim/BUCK b/apps/pim/BUCK
index 5a1c074..2fa4c60 100644
--- a/apps/pim/BUCK
+++ b/apps/pim/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-app-pim'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/apps/proxyarp/BUCK b/apps/proxyarp/BUCK
index 8c7328e..db784ae 100644
--- a/apps/proxyarp/BUCK
+++ b/apps/proxyarp/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-app-proxyarp'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/apps/routing-api/BUCK b/apps/routing-api/BUCK
index 26c30ad..ca457c1 100644
--- a/apps/routing-api/BUCK
+++ b/apps/routing-api/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-app-routing-api'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/apps/routing/BUCK b/apps/routing/BUCK
index 7523af9..1c69daa 100644
--- a/apps/routing/BUCK
+++ b/apps/routing/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-app-routing'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/apps/sdnip/BUCK b/apps/sdnip/BUCK
index 450ab22..e7d4796 100644
--- a/apps/sdnip/BUCK
+++ b/apps/sdnip/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-app-sdnip'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/apps/segmentrouting/BUCK b/apps/segmentrouting/BUCK
index 3ed2a55..ed46955 100644
--- a/apps/segmentrouting/BUCK
+++ b/apps/segmentrouting/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-app-segmentrouting'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/apps/virtualbng/BUCK b/apps/virtualbng/BUCK
index b453226..126723f 100644
--- a/apps/virtualbng/BUCK
+++ b/apps/virtualbng/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-app-virtualbng'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/apps/vpls/BUCK b/apps/vpls/BUCK
index f9c88b3..baa88df 100644
--- a/apps/vpls/BUCK
+++ b/apps/vpls/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-app-vpls'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/apps/vrouter/BUCK b/apps/vrouter/BUCK
index b94198a..c6ce965 100644
--- a/apps/vrouter/BUCK
+++ b/apps/vrouter/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-app-vrouter'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/apps/vtn/BUCK b/apps/vtn/BUCK
index e653036..2b41c08 100644
--- a/apps/vtn/BUCK
+++ b/apps/vtn/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
diff --git a/apps/xos-integration/BUCK b/apps/xos-integration/BUCK
index 1413d0f..198cc6b 100644
--- a/apps/xos-integration/BUCK
+++ b/apps/xos-integration/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-app-xos-integration'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/core/net/BUCK b/core/net/BUCK
index 42cb80c..9ec8907 100644
--- a/core/net/BUCK
+++ b/core/net/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 CURRENT_NAME = 'onos-core-net'
 CURRENT_TARGET = ':' + CURRENT_NAME
 
diff --git a/drivers/default/BUCK b/drivers/default/BUCK
index 7d72141..fa0a893 100644
--- a/drivers/default/BUCK
+++ b/drivers/default/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-drivers-default'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/incubator/api/BUCK b/incubator/api/BUCK
index 13fd42b..f2a0cd5 100644
--- a/incubator/api/BUCK
+++ b/incubator/api/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/incubator/**/'
-TEST = 'src/main/java/org/onosproject/incubator/**/'
+TEST = 'src/test/java/org/onosproject/incubator/**/'
 CURRENT_NAME = 'onos-incubator-api'
 CURRENT_TARGET = ':' + CURRENT_NAME
 
diff --git a/incubator/net/BUCK b/incubator/net/BUCK
index 8a87455..a2e336f 100644
--- a/incubator/net/BUCK
+++ b/incubator/net/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/incubator/net/**/'
-TEST = 'src/main/java/org/onosproject/incubator/net/**/'
+TEST = 'src/test/java/org/onosproject/incubator/net/**/'
 CURRENT_NAME = 'onos-incubator-net'
 CURRENT_TARGET = ':' + CURRENT_NAME
 
diff --git a/protocols/isis/BUCK b/protocols/isis/BUCK
index 065b089..966b1e7 100644
--- a/protocols/isis/BUCK
+++ b/protocols/isis/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
diff --git a/providers/bgp/topology/BUCK b/providers/bgp/topology/BUCK
index e0f5321..6ea4e5b 100644
--- a/providers/bgp/topology/BUCK
+++ b/providers/bgp/topology/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-bgp-provider-topology'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/providers/lldp/BUCK b/providers/lldp/BUCK
index 99d526d..dcc091f 100644
--- a/providers/lldp/BUCK
+++ b/providers/lldp/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-lldp-provider'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/providers/lldpcommon/BUCK b/providers/lldpcommon/BUCK
index f9b1b12..2053e29 100644
--- a/providers/lldpcommon/BUCK
+++ b/providers/lldpcommon/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-lldp-provider-common'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/providers/netcfghost/BUCK b/providers/netcfghost/BUCK
index 51fe94b..d548290 100644
--- a/providers/netcfghost/BUCK
+++ b/providers/netcfghost/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-netcfg-links-provider'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/providers/netcfglinks/BUCK b/providers/netcfglinks/BUCK
index c752714..1a92055 100644
--- a/providers/netcfglinks/BUCK
+++ b/providers/netcfglinks/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-netcfg-links-provider'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/providers/null/BUCK b/providers/null/BUCK
index a449353..0922a76 100644
--- a/providers/null/BUCK
+++ b/providers/null/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-null-providers'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/providers/openflow/device/BUCK b/providers/openflow/device/BUCK
index b243b36..c27bda4 100644
--- a/providers/openflow/device/BUCK
+++ b/providers/openflow/device/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-of-provider-device'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/providers/openflow/flow/BUCK b/providers/openflow/flow/BUCK
index 299e97d..8413106 100644
--- a/providers/openflow/flow/BUCK
+++ b/providers/openflow/flow/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-of-provider-flow'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/providers/openflow/group/BUCK b/providers/openflow/group/BUCK
index 98cd938..6e1f55a 100644
--- a/providers/openflow/group/BUCK
+++ b/providers/openflow/group/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-of-provider-group'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/providers/openflow/message/BUCK b/providers/openflow/message/BUCK
index 139062a..721518c 100644
--- a/providers/openflow/message/BUCK
+++ b/providers/openflow/message/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-of-provider-message'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/providers/openflow/meter/BUCK b/providers/openflow/meter/BUCK
index 2d9cc70..a9bea90 100644
--- a/providers/openflow/meter/BUCK
+++ b/providers/openflow/meter/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-of-provider-meter'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/providers/openflow/packet/BUCK b/providers/openflow/packet/BUCK
index 0356876..bc579ee 100644
--- a/providers/openflow/packet/BUCK
+++ b/providers/openflow/packet/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-of-provider-packet'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/providers/ovsdb/device/BUCK b/providers/ovsdb/device/BUCK
index e9aa0b6..7206649 100644
--- a/providers/ovsdb/device/BUCK
+++ b/providers/ovsdb/device/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-ovsdb-provider-device'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/providers/ovsdb/host/BUCK b/providers/ovsdb/host/BUCK
index 4b4dc05..38d9121 100644
--- a/providers/ovsdb/host/BUCK
+++ b/providers/ovsdb/host/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-ovsdb-provider-host'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/providers/ovsdb/tunnel/BUCK b/providers/ovsdb/tunnel/BUCK
index c88cbf6..d7bee96 100644
--- a/providers/ovsdb/tunnel/BUCK
+++ b/providers/ovsdb/tunnel/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-ovsdb-provider-tunnel'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/providers/pcep/topology/BUCK b/providers/pcep/topology/BUCK
index 91564cf..f5f0119 100644
--- a/providers/pcep/topology/BUCK
+++ b/providers/pcep/topology/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-pcep-provider-topology'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/providers/pcep/tunnel/BUCK b/providers/pcep/tunnel/BUCK
index 1b2fe6e..50969c2 100644
--- a/providers/pcep/tunnel/BUCK
+++ b/providers/pcep/tunnel/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-pcep-provider-tunnel'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/providers/rest/device/BUCK b/providers/rest/device/BUCK
index b710097..6b4e2a4 100644
--- a/providers/rest/device/BUCK
+++ b/providers/rest/device/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-restsb-provider-device'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/providers/snmp/alarm/BUCK b/providers/snmp/alarm/BUCK
index 63f0826..0630028 100644
--- a/providers/snmp/alarm/BUCK
+++ b/providers/snmp/alarm/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-snmp-provider-alarm'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/providers/snmp/device/BUCK b/providers/snmp/device/BUCK
index 749a7e2..7cbb381 100644
--- a/providers/snmp/device/BUCK
+++ b/providers/snmp/device/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-snmp-provider-device'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/web/api/BUCK b/web/api/BUCK
index 0048869..4932fca 100644
--- a/web/api/BUCK
+++ b/web/api/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-rest'
 CURRENT_TARGET = ':' + CURRENT_NAME
diff --git a/web/gui/BUCK b/web/gui/BUCK
index c00da6c..5301057 100644
--- a/web/gui/BUCK
+++ b/web/gui/BUCK
@@ -1,5 +1,5 @@
 SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/main/java/org/onosproject/**/'
+TEST = 'src/test/java/org/onosproject/**/'
 
 CURRENT_NAME = 'onos-gui'
 CURRENT_TARGET = ':' + CURRENT_NAME