diff --git a/incubator/api/BUILD b/incubator/api/BUILD
index c0beb98..c6ca52a 100644
--- a/incubator/api/BUILD
+++ b/incubator/api/BUILD
@@ -2,8 +2,8 @@
 
 TEST_DEPS = TEST_ADAPTERS
 
-osgi_jar_with_tests (
-    deps = COMPILE_DEPS,
+osgi_jar_with_tests(
     test_deps = TEST_DEPS,
     visibility = ["//visibility:public"],
+    deps = COMPILE_DEPS,
 )
diff --git a/incubator/net/BUILD b/incubator/net/BUILD
index d6ed989..059f656 100644
--- a/incubator/net/BUILD
+++ b/incubator/net/BUILD
@@ -1,18 +1,18 @@
 COMPILE_DEPS = CORE_DEPS + JACKSON + METRICS + KRYO + [
-    '//incubator/store:onos-incubator-store',
-    '//incubator/api:onos-incubator-api',
-    '//core/common:onos-core-common',
+    "//incubator/store:onos-incubator-store",
+    "//incubator/api:onos-incubator-api",
+    "//core/common:onos-core-common",
 ]
 
 TEST_DEPS = TEST_REST + [
-    '//incubator/api:onos-incubator-api-tests',
+    "//incubator/api:onos-incubator-api-tests",
 ]
 
-osgi_jar_with_tests (
-    deps = COMPILE_DEPS,
-    test_deps = TEST_DEPS,
+osgi_jar_with_tests(
     exclude_tests = [
-        'org.onosproject.incubator.net.virtual.impl.VirtualNetworkIntentManagerTest',
+        "org.onosproject.incubator.net.virtual.impl.VirtualNetworkIntentManagerTest",
     ],
+    test_deps = TEST_DEPS,
     visibility = ["//visibility:public"],
+    deps = COMPILE_DEPS,
 )
diff --git a/incubator/store/BUILD b/incubator/store/BUILD
index 37ce25a..9fd3b5f 100644
--- a/incubator/store/BUILD
+++ b/incubator/store/BUILD
@@ -1,15 +1,15 @@
 COMPILE_DEPS = CORE_DEPS + KRYO + [
-    '//core/common:onos-core-common',
-    '//utils/rest:onlab-rest',
-    '//core/store/serializers:onos-core-serializers',
-    '@concurrent_trees//jar',
-    '//incubator/api:onos-incubator-api',
+    "//core/common:onos-core-common",
+    "//utils/rest:onlab-rest",
+    "//core/store/serializers:onos-core-serializers",
+    "@concurrent_trees//jar",
+    "//incubator/api:onos-incubator-api",
 ]
 
 TEST_DEPS = TEST_ADAPTERS
 
-osgi_jar_with_tests (
-    deps = COMPILE_DEPS,
+osgi_jar_with_tests(
     test_deps = TEST_DEPS,
     visibility = ["//visibility:public"],
+    deps = COMPILE_DEPS,
 )