diff --git a/sql/core/src/test/scala/org/apache/spark/sql/execution/SparkPlanTest.scala b/sql/core/src/test/scala/org/apache/spark/sql/execution/SparkPlanTest.scala
index e72736d9e2691..03650a02d5248 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/execution/SparkPlanTest.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/execution/SparkPlanTest.scala
@@ -301,7 +301,9 @@ object SparkPlanTest {
     val resolvedPlan = TestSQLContext.prepareForExecution.execute(
       outputPlan transform {
         case plan: SparkPlan =>
-          val inputMap = plan.children.flatMap(_.output).map(a => (a.name, a)).toMap
+          val inputMap = plan.children.flatMap(_.output).zipWithIndex.map { case (a, i) =>
+            (a.name, BoundReference(i, a.dataType, a.nullable))
+          }.toMap
           plan.transformExpressions {
             case UnresolvedAttribute(Seq(u)) =>
               inputMap.getOrElse(u,