diff --git a/dev/diffs/3.4.2.diff b/dev/diffs/3.4.2.diff
index 79609f65ee..4b39f2290c 100644
--- a/dev/diffs/3.4.2.diff
+++ b/dev/diffs/3.4.2.diff
@@ -210,6 +210,26 @@ index 0efe0877e9b..423d3b3d76d 100644
  --
  -- SELECT_HAVING
  -- https://github.com/postgres/postgres/blob/REL_12_BETA2/src/test/regress/sql/select_having.sql
+diff --git a/sql/core/src/test/scala/org/apache/spark/sql/DataFrameAggregateSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/DataFrameAggregateSuite.scala
+index ea5e47ede55..cab59443c79 100644
+--- a/sql/core/src/test/scala/org/apache/spark/sql/DataFrameAggregateSuite.scala
++++ b/sql/core/src/test/scala/org/apache/spark/sql/DataFrameAggregateSuite.scala
+@@ -24,6 +24,7 @@ import scala.util.Random
+ import org.scalatest.matchers.must.Matchers.the
+ 
+ import org.apache.spark.SparkException
++import org.apache.spark.sql.comet.execution.shuffle.CometShuffleExchangeExec
+ import org.apache.spark.sql.execution.WholeStageCodegenExec
+ import org.apache.spark.sql.execution.adaptive.AdaptiveSparkPlanHelper
+ import org.apache.spark.sql.execution.aggregate.{HashAggregateExec, ObjectHashAggregateExec, SortAggregateExec}
+@@ -756,6 +757,7 @@ class DataFrameAggregateSuite extends QueryTest
+ 
+       val exchangePlans = collect(aggPlan) {
+         case shuffle: ShuffleExchangeExec => shuffle
++        case shuffle: CometShuffleExchangeExec => shuffle
+       }
+       assert(exchangePlans.length == 1)
+     }
 diff --git a/sql/core/src/test/scala/org/apache/spark/sql/DataFrameJoinSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/DataFrameJoinSuite.scala
 index 56e9520fdab..917932336df 100644
 --- a/sql/core/src/test/scala/org/apache/spark/sql/DataFrameJoinSuite.scala