diff --git a/sql/core/src/test/scala/org/apache/spark/sql/test/RandomDataGenerator.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/RandomDataGenerator.scala
similarity index 98%
rename from sql/core/src/test/scala/org/apache/spark/sql/test/RandomDataGenerator.scala
rename to sql/catalyst/src/test/scala/org/apache/spark/sql/RandomDataGenerator.scala
index 6ac2ba155655c..f167557be818f 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/test/RandomDataGenerator.scala
+++ b/sql/catalyst/src/test/scala/org/apache/spark/sql/RandomDataGenerator.scala
@@ -15,14 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.spark.sql.test
+package org.apache.spark.sql
 
-import org.apache.spark.sql.Row
+import org.apache.spark.sql.types._
 
 import scala.util.Random
 
-import org.apache.spark.sql.types._
-
 /**
  * Random data generators for Spark SQL DataTypes. These generators do not generate uniformly random
  * values; instead, they're biased to return "interesting" values (such as maximum / minimum values)
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/test/RandomDataGeneratorSuite.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/RandomDataGeneratorSuite.scala
similarity index 95%
rename from sql/core/src/test/scala/org/apache/spark/sql/test/RandomDataGeneratorSuite.scala
rename to sql/catalyst/src/test/scala/org/apache/spark/sql/RandomDataGeneratorSuite.scala
index fb4ed9028c2c5..ea70fe03eb912 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/test/RandomDataGeneratorSuite.scala
+++ b/sql/catalyst/src/test/scala/org/apache/spark/sql/RandomDataGeneratorSuite.scala
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.spark.sql.test
+package org.apache.spark.sql
 
 import org.apache.spark.SparkFunSuite
 import org.apache.spark.sql.catalyst.CatalystTypeConverters
-import org.apache.spark.sql.types.{StructField, StructType, MapType, DataType}
+import org.apache.spark.sql.types._
 
 /**
  * Tests of [[RandomDataGenerator]].
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/test/DataTypeTestUtils.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/types/DataTypeTestUtils.scala
similarity index 96%
rename from sql/core/src/test/scala/org/apache/spark/sql/test/DataTypeTestUtils.scala
rename to sql/catalyst/src/test/scala/org/apache/spark/sql/types/DataTypeTestUtils.scala
index d862eb7293d6d..0b7ed54c681e9 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/test/DataTypeTestUtils.scala
+++ b/sql/catalyst/src/test/scala/org/apache/spark/sql/types/DataTypeTestUtils.scala
@@ -15,9 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.spark.sql.test
-
-import org.apache.spark.sql.types._
+package org.apache.spark.sql.types
 
 /**
  * Utility functions for working with DataTypes in tests.