diff --git a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/plans/PlanTest.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/plans/PlanTest.scala
index 5394732f41f2..6e2a8427659c 100644
--- a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/plans/PlanTest.scala
+++ b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/plans/PlanTest.scala
@@ -84,6 +84,13 @@ trait PlanTestBase extends PredicateHelper with SQLHelper { self: Suite =>
     }
   }
 
+  private def rewriteNameFromAttrNullability(plan: LogicalPlan): LogicalPlan = {
+    plan.transformAllExpressions {
+      case a @ AttributeReference(name, _, false, _) =>
+        a.copy(name = s"*$name")(exprId = a.exprId, qualifier = a.qualifier)
+    }
+  }
+
   /**
    * Normalizes plans:
    * - Filter the filter conditions that appear in a plan. For instance,
@@ -138,7 +145,9 @@ trait PlanTestBase extends PredicateHelper with SQLHelper { self: Suite =>
       fail(
         s"""
           |== FAIL: Plans do not match ===
-          |${sideBySide(normalized1.treeString, normalized2.treeString).mkString("\n")}
+          |${sideBySide(
+            rewriteNameFromAttrNullability(normalized1).treeString,
+            rewriteNameFromAttrNullability(normalized2).treeString).mkString("\n")}
          """.stripMargin)
     }
   }
@@ -156,7 +165,9 @@ trait PlanTestBase extends PredicateHelper with SQLHelper { self: Suite =>
       fail(
         s"""
            |== FAIL: Plans do not match ===
-           |${sideBySide(normalized1.treeString, normalized2.treeString).mkString("\n")}
+           |${sideBySide(
+             rewriteNameFromAttrNullability(normalized1).treeString,
+             rewriteNameFromAttrNullability(normalized2).treeString).mkString("\n")}
          """.stripMargin)
     }
   }