diff --git a/go/vt/grpcclient/client.go b/go/vt/grpcclient/client.go
index e9209277b7c..b8a8847ac4f 100644
--- a/go/vt/grpcclient/client.go
+++ b/go/vt/grpcclient/client.go
@@ -142,7 +142,7 @@ func DialContext(ctx context.Context, target string, failFast FailFast, opts ...
 
 	newopts = append(newopts, interceptors()...)
 
-	return grpc.DialContext(ctx, target, newopts...)
+	return grpc.DialContext(ctx, target, newopts...) // nolint:staticcheck
 }
 
 func interceptors() []grpc.DialOption {
diff --git a/go/vt/grpcoptionaltls/server_test.go b/go/vt/grpcoptionaltls/server_test.go
index e419294b172..47d30404b88 100755
--- a/go/vt/grpcoptionaltls/server_test.go
+++ b/go/vt/grpcoptionaltls/server_test.go
@@ -97,7 +97,7 @@ func TestOptionalTLS(t *testing.T) {
 	testFunc := func(t *testing.T, dialOpt grpc.DialOption) {
 		ctx, cancel := context.WithTimeout(testCtx, 5*time.Second)
 		defer cancel()
-		conn, err := grpc.DialContext(ctx, addr, dialOpt)
+		conn, err := grpc.DialContext(ctx, addr, dialOpt) // nolint:staticcheck
 		if err != nil {
 			t.Fatalf("failed to connect to the server %v", err)
 		}
diff --git a/go/vt/topo/etcd2topo/server.go b/go/vt/topo/etcd2topo/server.go
index 95bebb1fecf..085ec3f3ff0 100644
--- a/go/vt/topo/etcd2topo/server.go
+++ b/go/vt/topo/etcd2topo/server.go
@@ -141,7 +141,7 @@ func NewServerWithOpts(serverAddr, root, certPath, keyPath, caPath string) (*Ser
 	config := clientv3.Config{
 		Endpoints:   strings.Split(serverAddr, ","),
 		DialTimeout: 5 * time.Second,
-		DialOptions: []grpc.DialOption{grpc.WithBlock()},
+		DialOptions: []grpc.DialOption{grpc.WithBlock()}, // nolint:staticcheck
 	}
 
 	tlscfg, err := newTLSConfig(certPath, keyPath, caPath)
diff --git a/go/vt/vtadmin/grpcserver/server_test.go b/go/vt/vtadmin/grpcserver/server_test.go
index 4f43c4413ce..6432b11f714 100644
--- a/go/vt/vtadmin/grpcserver/server_test.go
+++ b/go/vt/vtadmin/grpcserver/server_test.go
@@ -64,7 +64,7 @@ func TestServer(t *testing.T) {
 	}
 	close(readyCh)
 
-	conn, err := grpc.Dial(lis.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithBlock())
+	conn, err := grpc.Dial(lis.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithBlock()) // nolint:staticcheck
 	assert.NoError(t, err)
 
 	defer conn.Close()
diff --git a/go/vtbench/client.go b/go/vtbench/client.go
index 3e3ef3c495d..585a66d356f 100644
--- a/go/vtbench/client.go
+++ b/go/vtbench/client.go
@@ -84,7 +84,7 @@ var vtgateConns = map[string]*vtgateconn.VTGateConn{}
 func (c *grpcVtgateConn) connect(ctx context.Context, cp ConnParams) error {
 	withBlockOnce.Do(func() {
 		grpcclient.RegisterGRPCDialOptions(func(opts []grpc.DialOption) ([]grpc.DialOption, error) {
-			return append(opts, grpc.WithBlock()), nil
+			return append(opts, grpc.WithBlock()), nil // nolint:staticcheck
 		})
 	})
 
@@ -119,7 +119,7 @@ var vttabletConns = map[string]queryservice.QueryService{}
 func (c *grpcVttabletConn) connect(ctx context.Context, cp ConnParams) error {
 	withBlockOnce.Do(func() {
 		grpcclient.RegisterGRPCDialOptions(func(opts []grpc.DialOption) ([]grpc.DialOption, error) {
-			return append(opts, grpc.WithBlock()), nil
+			return append(opts, grpc.WithBlock()), nil // nolint:staticcheck
 		})
 	})