diff --git a/protocols/grpc/api/BUCK b/protocols/grpc/api/BUCK
index 66efde3..f0c8fd3 100644
--- a/protocols/grpc/api/BUCK
+++ b/protocols/grpc/api/BUCK
@@ -1,12 +1,11 @@
+GRPC_VER = '1.3.0'
+
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
-    '//lib:grpc-core-1.3.0',
-    '//lib:grpc-protobuf-1.3.0',
-    '//lib:grpc-stub-1.3.0',
-    '//lib:grpc-netty-1.3.0',
-    '//lib:grpc-auth-1.3.0',
+    '//incubator/grpc-dependencies:grpc-core-repkg-' + GRPC_VER,
+    '//lib:grpc-stub-' + GRPC_VER,
 ]
 
-osgi_jar_with_tests (
+osgi_jar (
     deps = COMPILE_DEPS,
 )
diff --git a/protocols/grpc/ctl/BUCK b/protocols/grpc/ctl/BUCK
index 18e0411..d6cab68 100644
--- a/protocols/grpc/ctl/BUCK
+++ b/protocols/grpc/ctl/BUCK
@@ -1,22 +1,16 @@
+PROTOC_VER = '3.0.2'
+GRPC_VER = '1.3.0'
+
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//protocols/grpc/api:onos-protocols-grpc-api',
     '//protocols/grpc/proto:onos-protocols-grpc-proto',
-    '//lib:grpc-core-1.3.0',
-    '//lib:grpc-protobuf-1.3.0',
-    '//lib:grpc-stub-1.3.0',
-    '//lib:grpc-netty-1.3.0',
-    '//lib:grpc-auth-1.3.0',
-    '//lib:protobuf-java-3.0.2',
+    '//incubator/grpc-dependencies:grpc-core-repkg-' + GRPC_VER,
+    '//lib:grpc-stub-' + GRPC_VER,
+    '//lib:protobuf-java-' + PROTOC_VER,
 ]
 
-TEST_DEPS = [
-    '//lib:TEST_ADAPTERS',
-    '//utils/osgi:onlab-osgi-tests',
-]
-
-osgi_jar_with_tests (
+osgi_jar (
     deps = COMPILE_DEPS,
-    test_deps = TEST_DEPS,
 )
 
diff --git a/protocols/grpc/proto/BUCK b/protocols/grpc/proto/BUCK
index f354b39..b1be821 100644
--- a/protocols/grpc/proto/BUCK
+++ b/protocols/grpc/proto/BUCK
@@ -5,7 +5,6 @@
 PROTOC_VER = '3.0.2'
 GRPC_VER = '1.3.0'
 
-
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//incubator/grpc-dependencies:grpc-core-repkg-' + GRPC_VER,
@@ -14,7 +13,6 @@
     '//lib:protobuf-java-' + PROTOC_VER,
 ]
 
-
 grpc_jar(
     proto_match_patterns = ["*.proto"],
     proto_paths = ["$ONOS_ROOT/protocols/grpc/proto/"],