diff --git a/nucleus/gnmi_transport_test.go b/nucleus/gnmi_transport_test.go
index 09573133979bb80564a681b6c940b1b60f3cb170..3cd5cc2d706978b141299b51a97250466751e51e 100644
--- a/nucleus/gnmi_transport_test.go
+++ b/nucleus/gnmi_transport_test.go
@@ -37,15 +37,6 @@ func testSetupGnmi() {
 		Encoding: gpb.Encoding_PROTO,
 	}
 
-	gnmiTransportOptions = &GnmiTransportOptions{
-		Username: "test",
-		Password: "test",
-		Addr:     "localhost:13371",
-		SetNode:  nil,
-		RespChan: make(chan *gpb.SubscribeResponse),
-		Encoding: gpb.Encoding_PROTO,
-	}
-
 	startGnmiTarget = make(chan string)
 	stopGnmiTarget = make(chan bool)
 	go targetRunner()
@@ -64,13 +55,24 @@ func mockTransport() Gnmi {
 	return Gnmi{
 		SetNode:  nil,
 		RespChan: make(chan *gpb.SubscribeResponse),
+		Options:  newGnmiTransportOptions(),
 		config:   gnmiConfig,
 		client:   &mocks.GNMIClient{},
 	}
 }
 
+func newGnmiTransportOptions() *GnmiTransportOptions {
+	return &GnmiTransportOptions{
+		Username: "test",
+		Password: "test",
+		Addr:     "localhost:13371",
+		SetNode:  nil,
+		RespChan: make(chan *gpb.SubscribeResponse),
+		Encoding: gpb.Encoding_PROTO,
+	}
+}
+
 var gnmiConfig *gnmi.Config
-var gnmiTransportOptions *GnmiTransportOptions
 var startGnmiTarget chan string
 var stopGnmiTarget chan bool
 var mockContext = mock.MatchedBy(func(ctx context.Context) bool { return true })
@@ -89,7 +91,7 @@ func TestNewGnmiTransport(t *testing.T) {
 		{
 			name: "default",
 			args: args{
-				opts: gnmiTransportOptions,
+				opts: newGnmiTransportOptions(),
 			},
 			want:    &gnmiTransport,
 			wantErr: false,