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": [
 			{
diff --git a/tests/core/api/grpc_nbi_api_handler_client_test.go b/tests/core/api/grpc_nbi_api_handler_client_test.go
index f90427b..148b664 100644
--- a/tests/core/api/grpc_nbi_api_handler_client_test.go
+++ b/tests/core/api/grpc_nbi_api_handler_client_test.go
@@ -24,9 +24,9 @@
 	"github.com/golang/protobuf/ptypes/empty"
 	com "github.com/opencord/voltha-lib-go/v2/pkg/adapters/common"
 	"github.com/opencord/voltha-lib-go/v2/pkg/log"
-	"github.com/opencord/voltha-protos/go/common"
-	"github.com/opencord/voltha-protos/go/openflow_13"
-	"github.com/opencord/voltha-protos/go/voltha"
+	"github.com/opencord/voltha-protos/v2/go/common"
+	"github.com/opencord/voltha-protos/v2/go/openflow_13"
+	"github.com/opencord/voltha-protos/v2/go/voltha"
 	"github.com/stretchr/testify/assert"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/tests/core/concurrency/core_concurrency_test.go b/tests/core/concurrency/core_concurrency_test.go
index 47682f3..4f1e4da 100644
--- a/tests/core/concurrency/core_concurrency_test.go
+++ b/tests/core/concurrency/core_concurrency_test.go
@@ -25,8 +25,8 @@
 	"github.com/google/uuid"
 	com "github.com/opencord/voltha-lib-go/v2/pkg/adapters/common"
 	"github.com/opencord/voltha-lib-go/v2/pkg/log"
-	"github.com/opencord/voltha-protos/go/common"
-	"github.com/opencord/voltha-protos/go/voltha"
+	"github.com/opencord/voltha-protos/v2/go/common"
+	"github.com/opencord/voltha-protos/v2/go/voltha"
 	"github.com/stretchr/testify/assert"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
diff --git a/tests/core/flow_management_test.go b/tests/core/flow_management_test.go
index dbdc0cf..9c08e7a 100644
--- a/tests/core/flow_management_test.go
+++ b/tests/core/flow_management_test.go
@@ -24,9 +24,9 @@
 	fu "github.com/opencord/voltha-go/rw_core/utils"
 	tu "github.com/opencord/voltha-go/tests/utils"
 	"github.com/opencord/voltha-lib-go/v2/pkg/log"
-	"github.com/opencord/voltha-protos/go/common"
-	ofp "github.com/opencord/voltha-protos/go/openflow_13"
-	"github.com/opencord/voltha-protos/go/voltha"
+	"github.com/opencord/voltha-protos/v2/go/common"
+	ofp "github.com/opencord/voltha-protos/v2/go/openflow_13"
+	"github.com/opencord/voltha-protos/v2/go/voltha"
 	"github.com/stretchr/testify/assert"
 	"google.golang.org/grpc/metadata"
 	"math"
diff --git a/tests/core/performance_metrics_test.go b/tests/core/performance_metrics_test.go
index f5a19d7..f5867ad 100644
--- a/tests/core/performance_metrics_test.go
+++ b/tests/core/performance_metrics_test.go
@@ -23,8 +23,8 @@
 	"github.com/google/uuid"
 	tu "github.com/opencord/voltha-go/tests/utils"
 	"github.com/opencord/voltha-lib-go/v2/pkg/log"
-	"github.com/opencord/voltha-protos/go/common"
-	"github.com/opencord/voltha-protos/go/voltha"
+	"github.com/opencord/voltha-protos/v2/go/common"
+	"github.com/opencord/voltha-protos/v2/go/voltha"
 	"github.com/stretchr/testify/assert"
 	"google.golang.org/grpc/metadata"
 	"math"
diff --git a/tests/kafka/kafka_client_test.go b/tests/kafka/kafka_client_test.go
index d2c1c53..0c3f657 100644
--- a/tests/kafka/kafka_client_test.go
+++ b/tests/kafka/kafka_client_test.go
@@ -24,7 +24,7 @@
 	"github.com/google/uuid"
 	kk "github.com/opencord/voltha-lib-go/v2/pkg/kafka"
 	"github.com/opencord/voltha-lib-go/v2/pkg/log"
-	ic "github.com/opencord/voltha-protos/go/inter_container"
+	ic "github.com/opencord/voltha-protos/v2/go/inter_container"
 	"github.com/stretchr/testify/assert"
 	"os"
 	"testing"
diff --git a/tests/kafka/kafka_inter_container_messaging_test.go b/tests/kafka/kafka_inter_container_messaging_test.go
index 42670ff..7a7ce27 100644
--- a/tests/kafka/kafka_inter_container_messaging_test.go
+++ b/tests/kafka/kafka_inter_container_messaging_test.go
@@ -24,8 +24,8 @@
 	rhp "github.com/opencord/voltha-go/rw_core/core"
 	kk "github.com/opencord/voltha-lib-go/v2/pkg/kafka"
 	"github.com/opencord/voltha-lib-go/v2/pkg/log"
-	ic "github.com/opencord/voltha-protos/go/inter_container"
-	"github.com/opencord/voltha-protos/go/voltha"
+	ic "github.com/opencord/voltha-protos/v2/go/inter_container"
+	"github.com/opencord/voltha-protos/v2/go/voltha"
 	"github.com/stretchr/testify/assert"
 	"os"
 	"testing"
diff --git a/tests/utils/test_utils.go b/tests/utils/test_utils.go
index eeaf1dc..a0ebe56 100644
--- a/tests/utils/test_utils.go
+++ b/tests/utils/test_utils.go
@@ -27,9 +27,9 @@
 	"github.com/golang/protobuf/ptypes/empty"
 	"github.com/google/uuid"
 	com "github.com/opencord/voltha-lib-go/v2/pkg/adapters/common"
-	"github.com/opencord/voltha-protos/go/common"
-	ofp "github.com/opencord/voltha-protos/go/openflow_13"
-	"github.com/opencord/voltha-protos/go/voltha"
+	"github.com/opencord/voltha-protos/v2/go/common"
+	ofp "github.com/opencord/voltha-protos/v2/go/openflow_13"
+	"github.com/opencord/voltha-protos/v2/go/voltha"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"