diff --git a/fuzz-testing/src/main/scala/org/apache/comet/fuzz/DataGen.scala b/fuzz-testing/src/main/scala/org/apache/comet/fuzz/DataGen.scala
index 0c746e7b2..f9795a220 100644
--- a/fuzz-testing/src/main/scala/org/apache/comet/fuzz/DataGen.scala
+++ b/fuzz-testing/src/main/scala/org/apache/comet/fuzz/DataGen.scala
@@ -142,7 +142,7 @@ object DataGen {
           }
       case DataTypes.DateType =>
         Range(0, numRows).map(_ => new java.sql.Date(1716645600011L + r.nextInt()))
-      case DataTypes.TimestampType | DataTypes.TimestampNTZType =>
+      case DataTypes.TimestampType | dataType.typeName == "timestamp_ntz" =>
         Range(0, numRows).map(_ => new Timestamp(1716645600011L + r.nextInt()))
       case _ => throw new IllegalStateException(s"Cannot generate data for $dataType yet")
     }
diff --git a/fuzz-testing/src/main/scala/org/apache/comet/fuzz/Meta.scala b/fuzz-testing/src/main/scala/org/apache/comet/fuzz/Meta.scala
index e585aed69..962081077 100644
--- a/fuzz-testing/src/main/scala/org/apache/comet/fuzz/Meta.scala
+++ b/fuzz-testing/src/main/scala/org/apache/comet/fuzz/Meta.scala
@@ -35,6 +35,7 @@ object Meta {
     // (DataTypes.createDecimalType(10, 2), 0.2),
     (DataTypes.DateType, 0.2),
     (DataTypes.TimestampType, 0.2),
+    // TimestampNTZType only in Spark 3.4+
     // (DataTypes.TimestampNTZType, 0.2),
     (DataTypes.StringType, 0.2)
     // (DataTypes.BinaryType, 0.2)