diff --git a/tests/afrouter/suites/test1/test1.json b/tests/afrouter/suites/test1/test1.json
index b11ccec..444719c 100644
--- a/tests/afrouter/suites/test1/test1.json
+++ b/tests/afrouter/suites/test1/test1.json
@@ -3,25 +3,25 @@
 		"cmdLine":"afrouter -logLevel 1 -config arouter_test.json",
 		"protoFiles": [
 			{
-				"importPath":"github.com/opencord/voltha-protos/go/",
+				"importPath":"github.com/opencord/voltha-protos/v2/go/",
 				"service":"VolthaService",
 				"package":"voltha"
 			},
 			{
-				"importPath":"github.com/opencord/voltha-protos/go/",
+				"importPath":"github.com/opencord/voltha-protos/v2/go/",
 				"service":"Configuration",
 				"package":"afrouter"
 			}
 		],
 		"Junk": [
 			{
-				"importPath":"github.com/opencord/voltha-protos/go/",
+				"importPath":"github.com/opencord/voltha-protos/v2/go/",
 				"service":"Configuration",
 				"package":"afrouter"
 			}
 		],
 		"imports": [
-			"github.com/opencord/voltha-protos/go/common"
+			"github.com/opencord/voltha-protos/v2/go/common"
 		],
 		"protoDesc":"voltha.pb",
 		"protoSubst": [
@@ -33,8 +33,8 @@
 		"clients": {
 			"imports": [
 				"github.com/golang/protobuf/ptypes/empty",
-				"github.com/opencord/voltha-protos/go/openflow_13",
-				"github.com/opencord/voltha-protos/go/common"
+				"github.com/opencord/voltha-protos/v2/go/openflow_13",
+				"github.com/opencord/voltha-protos/v2/go/common"
 			],
 			"endpoints": [
 				{
@@ -50,9 +50,9 @@
 		"servers": {
 			"imports": [
 				"github.com/golang/protobuf/ptypes/empty",
-				"github.com/opencord/voltha-protos/go/openflow_13",
-				"github.com/opencord/voltha-protos/go/common",
-				"github.com/opencord/voltha-protos/go/omci"
+				"github.com/opencord/voltha-protos/v2/go/openflow_13",
+				"github.com/opencord/voltha-protos/v2/go/common",
+				"github.com/opencord/voltha-protos/v2/go/omci"
 			],
 			"endpoints": [
 			{
diff --git a/tests/afrouter/suites/test2/test2.tmpl.json b/tests/afrouter/suites/test2/test2.tmpl.json
index 879b533..afa0962 100644
--- a/tests/afrouter/suites/test2/test2.tmpl.json
+++ b/tests/afrouter/suites/test2/test2.tmpl.json
@@ -3,19 +3,19 @@
 		"cmdLine":"afrouter -config arouter_test.json -logLevel 1",
 		"protoFiles": [
 			{
-				"importPath":"github.com/opencord/voltha-protos/go/",
+				"importPath":"github.com/opencord/voltha-protos/v2/go/",
 				"service":"VolthaService",
 				"package":"voltha"
 			},
 			{
-				"importPath":"github.com/opencord/voltha-protos/go/",
+				"importPath":"github.com/opencord/voltha-protos/v2/go/",
 				"service":"Configuration",
 				"package":"afrouter"
 			}
 		],
 		"imports": [
 			"github.com/golang/protobuf/ptypes/empty",
-			"github.com/opencord/voltha-protos/go/common"
+			"github.com/opencord/voltha-protos/v2/go/common"
 		],
 		"protoDesc":"voltha.pb",
 		"protoSubst": [
@@ -27,8 +27,8 @@
 		"clients": {
 			"imports": [
 				"github.com/golang/protobuf/ptypes/empty",
-				"github.com/opencord/voltha-protos/go/openflow_13",
-				"github.com/opencord/voltha-protos/go/common"
+				"github.com/opencord/voltha-protos/v2/go/openflow_13",
+				"github.com/opencord/voltha-protos/v2/go/common"
 			],
 			"endpoints": [
 				{
@@ -44,9 +44,9 @@
 		"servers": {
 			"imports": [
 				"github.com/golang/protobuf/ptypes/empty",
-				"github.com/opencord/voltha-protos/go/openflow_13",
-				"github.com/opencord/voltha-protos/go/omci",
-				"github.com/opencord/voltha-protos/go/common"
+				"github.com/opencord/voltha-protos/v2/go/openflow_13",
+				"github.com/opencord/voltha-protos/v2/go/omci",
+				"github.com/opencord/voltha-protos/v2/go/common"
 			],
 			"endpoints": [
 			{
diff --git a/tests/afrouter/suites/test3/test3.tmpl.json b/tests/afrouter/suites/test3/test3.tmpl.json
index 4bf49cd..953031b 100644
--- a/tests/afrouter/suites/test3/test3.tmpl.json
+++ b/tests/afrouter/suites/test3/test3.tmpl.json
@@ -3,20 +3,20 @@
 		"cmdLine":"afrouter -config arouter_test.json -logLevel 1",
 		"protoFiles": [
 			{
-				"importPath":"github.com/opencord/voltha-protos/go/",
+				"importPath":"github.com/opencord/voltha-protos/v2/go/",
 				"service":"VolthaService",
 				"package":"voltha"
 			},
 			{
-				"importPath":"github.com/opencord/voltha-protos/go/",
+				"importPath":"github.com/opencord/voltha-protos/v2/go/",
 				"service":"Configuration",
 				"package":"afrouter"
 			}
 		],
 		"imports": [
 			"github.com/golang/protobuf/ptypes/empty",
-			"github.com/opencord/voltha-protos/go/openflow_13",
-			"github.com/opencord/voltha-protos/go/common"
+			"github.com/opencord/voltha-protos/v2/go/openflow_13",
+			"github.com/opencord/voltha-protos/v2/go/common"
 		],
 		"protoDesc":"voltha.pb",
 		"protoSubst": [
@@ -28,8 +28,8 @@
 		"clients": {
 			"imports": [
 				"github.com/golang/protobuf/ptypes/empty",
-				"github.com/opencord/voltha-protos/go/openflow_13",
-				"github.com/opencord/voltha-protos/go/common"
+				"github.com/opencord/voltha-protos/v2/go/openflow_13",
+				"github.com/opencord/voltha-protos/v2/go/common"
 			],
 			"endpoints": [
 				{
@@ -45,9 +45,9 @@
 		"servers": {
 			"imports": [
 				"github.com/golang/protobuf/ptypes/empty",
-				"github.com/opencord/voltha-protos/go/openflow_13",
-				"github.com/opencord/voltha-protos/go/omci",
-				"github.com/opencord/voltha-protos/go/common"
+				"github.com/opencord/voltha-protos/v2/go/openflow_13",
+				"github.com/opencord/voltha-protos/v2/go/omci",
+				"github.com/opencord/voltha-protos/v2/go/common"
 			],
 			"endpoints": [
 			{