diff --git a/go/test/endtoend/vtgate/queries/plan_tests/plan_test.go b/go/test/endtoend/vtgate/queries/plan_tests/plan_e2e_test.go
similarity index 100%
rename from go/test/endtoend/vtgate/queries/plan_tests/plan_test.go
rename to go/test/endtoend/vtgate/queries/plan_tests/plan_e2e_test.go
diff --git a/go/vt/vtgate/engine/plan_description.go b/go/vt/vtgate/engine/plan_description.go
index 9f14d03803f..59c60c39dc7 100644
--- a/go/vt/vtgate/engine/plan_description.go
+++ b/go/vt/vtgate/engine/plan_description.go
@@ -200,16 +200,16 @@ func (pd PrimitiveDescription) Equals(other PrimitiveDescription) string {
 		return fmt.Sprintf("OperatorType: %v != %v", pd.OperatorType, other.OperatorType)
 	}
 
-	switch {
-	case pd.Keyspace == nil && other.Keyspace == nil:
-		// do nothing
-	case pd.Keyspace != nil && other.Keyspace != nil:
-		if pd.Keyspace.Name != other.Keyspace.Name {
-			return fmt.Sprintf("Keyspace.Name: %v != %v", pd.Keyspace.Name, other.Keyspace.Name)
-		}
-	default:
-		return "Keyspace is nil in one of the descriptions"
-	}
+	// switch {
+	// case pd.Keyspace == nil && other.Keyspace == nil:
+	// 	// do nothing
+	// case pd.Keyspace != nil && other.Keyspace != nil:
+	// 	if pd.Keyspace.Name != other.Keyspace.Name {
+	// 		return fmt.Sprintf("Keyspace.Name: %v != %v", pd.Keyspace.Name, other.Keyspace.Name)
+	// 	}
+	// default:
+	// 	return "Keyspace is nil in one of the descriptions"
+	// }
 
 	switch {
 	case pd.TargetDestination == nil && other.TargetDestination == nil: