diff --git a/api/client/grpc.go b/api/client/grpc.go
index 60b292b7c..ddc6727d3 100644
--- a/api/client/grpc.go
+++ b/api/client/grpc.go
@@ -13,6 +13,7 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/connectivity"
 	"google.golang.org/grpc/credentials"
+	"google.golang.org/grpc/credentials/insecure"
 )
 
 const maxMsgSize = 1024 * 1024 * 100 // 100 megs ought to be enough for anybody!
@@ -64,7 +65,7 @@ func (c *GRPCClient) resetConn() error {
 		creds := credentials.NewTLS(c.tlsConfig)
 		opts = append(opts, grpc.WithTransportCredentials(creds))
 	} else {
-		opts = append(opts, grpc.WithInsecure())
+		opts = append(opts, grpc.WithTransportCredentials(insecure.NewCredentials()))
 	}
 
 	opts = append(opts, grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(maxMsgSize)))
diff --git a/test/cluster.go b/test/cluster.go
index a1294cd82..a64581a7b 100644
--- a/test/cluster.go
+++ b/test/cluster.go
@@ -489,16 +489,6 @@ func (c *ShareableCluster) Start() error {
 
 // Close stops a Cluster
 func (c *ShareableCluster) Close() error {
-	if c.shared {
-		for i := range c.Nodes {
-			holder := c.GetHolder(i)
-			indexes := holder.Indexes()
-			var indexNames []string
-			for _, idx := range indexes {
-				indexNames = append(indexNames, idx.Name())
-			}
-		}
-	}
 	for i, cc := range c.Nodes {
 		if err := cc.Close(); err != nil {
 			return errors.Wrapf(err, "stopping server %d", i)