diff --git a/BUILD b/BUILD
index 4e8af21..303f1f8 100644
--- a/BUILD
+++ b/BUILD
@@ -1,5 +1,5 @@
 load("//tools/build/bazel:generate_workspace.bzl", "ONOS_VERSION")
-load(":modules.bzl", "APPS", "CORE", )
+load(":modules.bzl", "APPS", "CORE")
 
 filegroup(
     name = "onos",
diff --git a/apps/pce/app/BUILD b/apps/pce/app/BUILD
index 1c3e14b..bdce3250 100644
--- a/apps/pce/app/BUILD
+++ b/apps/pce/app/BUILD
@@ -9,8 +9,12 @@
     "//apps/pce/bandwidthmgmt:onos-apps-pce-bandwidthmgmt",
 ]
 
+TEST_DEPS = TEST_REST + [
+    "//incubator/api:onos-incubator-api-tests",
+]
+
 osgi_jar_with_tests(
-    test_deps = TEST_REST,
+    test_deps = TEST_DEPS,
     deps = COMPILE_DEPS,
 )
 
diff --git a/drivers/default/BUILD b/drivers/default/BUILD
index e5649d2..ccb093f 100644
--- a/drivers/default/BUILD
+++ b/drivers/default/BUILD
@@ -24,4 +24,4 @@
     included_bundles = BUNDLES,
     title = "Default Drivers",
     url = "http://onosproject.org",
-)
\ No newline at end of file
+)
diff --git a/protocols/pcep/server/ctl/BUILD b/protocols/pcep/server/ctl/BUILD
index 45562dc..13a7fa3 100644
--- a/protocols/pcep/server/ctl/BUILD
+++ b/protocols/pcep/server/ctl/BUILD
@@ -7,6 +7,12 @@
     "//apps/pcep-api:onos-apps-pcep-api",
 ]
 
+TEST_DEPS = TEST_ADAPTERS + [
+    "//protocols/pcep/server/api:onos-protocols-pcep-server-api-tests",
+    "//incubator/api:onos-incubator-api-tests",
+]
+
 osgi_jar_with_tests(
+    test_deps = TEST_DEPS,
     deps = COMPILE_DEPS,
 )
diff --git a/providers/pcep/topology/BUILD b/providers/pcep/topology/BUILD
index e278d5c..784b257 100644
--- a/providers/pcep/topology/BUILD
+++ b/providers/pcep/topology/BUILD
@@ -10,6 +10,12 @@
     "//apps/optical-model:onos-apps-optical-model",
 ]
 
+TEST_DEPS = TEST + [
+    "//protocols/pcep/server/api:onos-protocols-pcep-server-api-tests",
+    "//apps/pcep-api:onos-apps-pcep-api-tests",
+]
+
 osgi_jar_with_tests(
+    test_deps = TEST_DEPS,
     deps = COMPILE_DEPS,
 )
diff --git a/providers/pcep/tunnel/BUILD b/providers/pcep/tunnel/BUILD
index b33bd8f..fb2e414 100644
--- a/providers/pcep/tunnel/BUILD
+++ b/providers/pcep/tunnel/BUILD
@@ -11,6 +11,9 @@
 TEST_DEPS = TEST_ADAPTERS + [
     "@netty//jar",
     "@netty_transport//jar",
+    "//protocols/pcep/server/api:onos-protocols-pcep-server-api-tests",
+    "//apps/pcep-api:onos-apps-pcep-api-tests",
+    "//incubator/api:onos-incubator-api-tests",
 ]
 
 osgi_jar_with_tests(