diff --git a/spark/src/test/scala/org/apache/spark/sql/CometTPCDSQuerySuite.scala b/spark/src/test/scala/org/apache/spark/sql/CometTPCDSQuerySuite.scala
index a3b73dfa0..4cfa686c9 100644
--- a/spark/src/test/scala/org/apache/spark/sql/CometTPCDSQuerySuite.scala
+++ b/spark/src/test/scala/org/apache/spark/sql/CometTPCDSQuerySuite.scala
@@ -138,9 +138,8 @@ class CometTPCDSQuerySuite
         "q99")
 
       // TODO: enable the 3 queries after fixing the issues #1358.
-      override val tpcdsQueries: Seq[String] = Seq("q4")
-      // tpcdsAllQueries.filterNot(excludedTpcdsQueries.contains)
-      // Seq("q1", "q2", "q3", "q4")
+      override val tpcdsQueries: Seq[String] =
+        tpcdsAllQueries.filterNot(excludedTpcdsQueries.contains)
     }
     with TPCDSQueryTestSuite {
   override def sparkConf: SparkConf = {