diff --git a/go/vt/vtctl/grpcvtctldclient/client_test.go b/go/vt/vtctl/grpcvtctldclient/client_test.go
index d365b376b34..9f6654cc49d 100644
--- a/go/vt/vtctl/grpcvtctldclient/client_test.go
+++ b/go/vt/vtctl/grpcvtctldclient/client_test.go
@@ -23,20 +23,24 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"vitess.io/vitess/go/test/utils"
+	"vitess.io/vitess/go/vt/topo"
 	"vitess.io/vitess/go/vt/topo/memorytopo"
 	"vitess.io/vitess/go/vt/vtctl/grpcvtctldserver"
 	"vitess.io/vitess/go/vt/vtctl/grpcvtctldserver/testutil"
 	"vitess.io/vitess/go/vt/vtctl/vtctldclient"
 
 	topodatapb "vitess.io/vitess/go/vt/proto/topodata"
-	"vitess.io/vitess/go/vt/proto/vtctldata"
 	vtctldatapb "vitess.io/vitess/go/vt/proto/vtctldata"
+	vtctlservicepb "vitess.io/vitess/go/vt/proto/vtctlservice"
 )
 
 func TestFindAllShardsInKeyspace(t *testing.T) {
 	ctx := context.Background()
 	ts := memorytopo.NewServer("cell1")
-	vtctld := grpcvtctldserver.NewVtctldServer(ts)
+	vtctld := testutil.NewVtctldServerWithTabletManagerClient(t, ts, nil, func(ts *topo.Server) vtctlservicepb.VtctldServer {
+		return grpcvtctldserver.NewVtctldServer(ts)
+	})
 
 	testutil.WithTestServer(t, vtctld, func(t *testing.T, client vtctldclient.VtctldClient) {
 		ks := &vtctldatapb.Keyspace{
@@ -67,7 +71,7 @@ func TestFindAllShardsInKeyspace(t *testing.T) {
 			},
 		}
 
-		assert.Equal(t, expected, resp.Shards)
+		utils.MustMatch(t, expected, resp.Shards)
 
 		client.Close()
 		_, err = client.FindAllShardsInKeyspace(ctx, &vtctldatapb.FindAllShardsInKeyspaceRequest{Keyspace: ks.Name})
@@ -79,11 +83,13 @@ func TestGetKeyspace(t *testing.T) {
 	ctx := context.Background()
 
 	ts := memorytopo.NewServer("cell1")
-	vtctld := grpcvtctldserver.NewVtctldServer(ts)
+	vtctld := testutil.NewVtctldServerWithTabletManagerClient(t, ts, nil, func(ts *topo.Server) vtctlservicepb.VtctldServer {
+		return grpcvtctldserver.NewVtctldServer(ts)
+	})
 
 	testutil.WithTestServer(t, vtctld, func(t *testing.T, client vtctldclient.VtctldClient) {
 		expected := &vtctldatapb.GetKeyspaceResponse{
-			Keyspace: &vtctldata.Keyspace{
+			Keyspace: &vtctldatapb.Keyspace{
 				Name: "testkeyspace",
 				Keyspace: &topodatapb.Keyspace{
 					ShardingColumnName: "col1",
@@ -94,7 +100,7 @@ func TestGetKeyspace(t *testing.T) {
 
 		resp, err := client.GetKeyspace(ctx, &vtctldatapb.GetKeyspaceRequest{Keyspace: expected.Keyspace.Name})
 		assert.NoError(t, err)
-		assert.Equal(t, expected, resp)
+		utils.MustMatch(t, expected, resp)
 
 		client.Close()
 		_, err = client.GetKeyspace(ctx, &vtctldatapb.GetKeyspaceRequest{})
@@ -106,7 +112,9 @@ func TestGetKeyspaces(t *testing.T) {
 	ctx := context.Background()
 
 	ts := memorytopo.NewServer("cell1")
-	vtctld := grpcvtctldserver.NewVtctldServer(ts)
+	vtctld := testutil.NewVtctldServerWithTabletManagerClient(t, ts, nil, func(ts *topo.Server) vtctlservicepb.VtctldServer {
+		return grpcvtctldserver.NewVtctldServer(ts)
+	})
 
 	testutil.WithTestServer(t, vtctld, func(t *testing.T, client vtctldclient.VtctldClient) {
 		resp, err := client.GetKeyspaces(ctx, &vtctldatapb.GetKeyspacesRequest{})
@@ -121,7 +129,7 @@ func TestGetKeyspaces(t *testing.T) {
 
 		resp, err = client.GetKeyspaces(ctx, &vtctldatapb.GetKeyspacesRequest{})
 		assert.NoError(t, err)
-		assert.Equal(t, []*vtctldatapb.Keyspace{expected}, resp.Keyspaces)
+		utils.MustMatch(t, []*vtctldatapb.Keyspace{expected}, resp.Keyspaces)
 
 		client.Close()
 		_, err = client.GetKeyspaces(ctx, &vtctldatapb.GetKeyspacesRequest{})