diff --git a/go/vt/topo/keyspace.go b/go/vt/topo/keyspace.go
index 2a0ea7b94db..dced769ca78 100755
--- a/go/vt/topo/keyspace.go
+++ b/go/vt/topo/keyspace.go
@@ -219,7 +219,7 @@ func (ts *Server) FindAllShardsInKeyspace(ctx context.Context, keyspace string,
 	// characters such as a dash.
 	keyspace, err := sqlescape.UnescapeID(keyspace)
 	if err != nil {
-		return nil, vterrors.Wrapf(err, "FindAllShardsInKeyspace(%s) invalid keyspace name: %v", keyspace, err)
+		return nil, vterrors.Wrapf(err, "FindAllShardsInKeyspace(%s) invalid keyspace name", keyspace)
 	}
 
 	// First try to get all shards using List if we can.
diff --git a/go/vt/topo/keyspace_external_test.go b/go/vt/topo/keyspace_external_test.go
index 9fdcbc0bdd6..bfcb2f591a9 100644
--- a/go/vt/topo/keyspace_external_test.go
+++ b/go/vt/topo/keyspace_external_test.go
@@ -58,7 +58,7 @@ func TestServerFindAllShardsInKeyspace(t *testing.T) {
 			opt:    &topo.FindAllShardsInKeyspaceOptions{Concurrency: 8},
 		},
 		{
-			name:     "backtick'd keyspace",
+			name:     "SQL escaped keyspace",
 			shards:   32,
 			keyspace: "`my-keyspace`",
 			opt:      &topo.FindAllShardsInKeyspaceOptions{Concurrency: 8},
diff --git a/go/vt/vtctl/workflow/server_test.go b/go/vt/vtctl/workflow/server_test.go
index 6bb3993fe1c..174cc2aaf6a 100644
--- a/go/vt/vtctl/workflow/server_test.go
+++ b/go/vt/vtctl/workflow/server_test.go
@@ -180,9 +180,10 @@ func TestVDiffCreate(t *testing.T) {
 		wantErr string
 	}{
 		{
-			name:    "no values",
-			req:     &vtctldatapb.VDiffCreateRequest{},
-			wantErr: "FindAllShardsInKeyspace(): List: node doesn't exist: keyspaces/shards", // We did not provide any keyspace or shard
+			name: "no values",
+			req:  &vtctldatapb.VDiffCreateRequest{},
+			// We did not provide any keyspace or shard.
+			wantErr: "FindAllShardsInKeyspace() invalid keyspace name: UnescapeID err: invalid input identifier ''",
 		},
 	}
 	for _, tt := range tests {