diff --git a/arrow/src/test/java/org/apache/calcite/adapter/arrow/ArrowAdapterDataTypesTest.java b/arrow/src/test/java/org/apache/calcite/adapter/arrow/ArrowAdapterDataTypesTest.java
index 5d3414532d6..06f4134a8aa 100644
--- a/arrow/src/test/java/org/apache/calcite/adapter/arrow/ArrowAdapterDataTypesTest.java
+++ b/arrow/src/test/java/org/apache/calcite/adapter/arrow/ArrowAdapterDataTypesTest.java
@@ -58,7 +58,7 @@ static void initializeArrowState(@TempDir Path sharedTempDir)
     arrowDataDirectory = arrowFilesDirectory.toFile();
 
     File dataLocationFile = arrowFilesDirectory.resolve("arrowdatatype.arrow").toFile();
-    ArrowDataTest arrowDataGenerator = new ArrowDataTest();
+    ArrowData arrowDataGenerator = new ArrowData();
     arrowDataGenerator.writeArrowDataType(dataLocationFile);
 
     arrow = ImmutableMap.of("model", modelFileTarget.toAbsolutePath().toString());
diff --git a/arrow/src/test/java/org/apache/calcite/adapter/arrow/ArrowAdapterTest.java b/arrow/src/test/java/org/apache/calcite/adapter/arrow/ArrowAdapterTest.java
index 03606feb48f..0a0475eacdd 100644
--- a/arrow/src/test/java/org/apache/calcite/adapter/arrow/ArrowAdapterTest.java
+++ b/arrow/src/test/java/org/apache/calcite/adapter/arrow/ArrowAdapterTest.java
@@ -73,12 +73,12 @@ static void initializeArrowState(@TempDir Path sharedTempDir)
     arrowDataDirectory = arrowFilesDirectory.toFile();
 
     File dataLocationFile = arrowFilesDirectory.resolve("arrowdata.arrow").toFile();
-    ArrowDataTest arrowDataGenerator = new ArrowDataTest();
+    ArrowData arrowDataGenerator = new ArrowData();
     arrowDataGenerator.writeArrowData(dataLocationFile);
     arrowDataGenerator.writeScottEmpData(arrowFilesDirectory);
 
     File datatypeLocationFile = arrowFilesDirectory.resolve("arrowdatatype.arrow").toFile();
-    ArrowDataTest arrowtypeDataGenerator = new ArrowDataTest();
+    ArrowData arrowtypeDataGenerator = new ArrowData();
     arrowtypeDataGenerator.writeArrowDataType(datatypeLocationFile);
 
     arrow = ImmutableMap.of("model", modelFileTarget.toAbsolutePath().toString());
diff --git a/arrow/src/test/java/org/apache/calcite/adapter/arrow/ArrowDataTest.java b/arrow/src/test/java/org/apache/calcite/adapter/arrow/ArrowData.java
similarity index 99%
rename from arrow/src/test/java/org/apache/calcite/adapter/arrow/ArrowDataTest.java
rename to arrow/src/test/java/org/apache/calcite/adapter/arrow/ArrowData.java
index 9557c69af22..0d70aa64003 100644
--- a/arrow/src/test/java/org/apache/calcite/adapter/arrow/ArrowDataTest.java
+++ b/arrow/src/test/java/org/apache/calcite/adapter/arrow/ArrowData.java
@@ -63,7 +63,7 @@
 /**
  * Class that can be used to generate Arrow sample data into a data directory.
  */
-public class ArrowDataTest {
+public class ArrowData {
 
   private final int batchSize;
   private final int entries;
@@ -77,7 +77,7 @@ public class ArrowDataTest {
   private boolean booleanValue;
   private BigDecimal decimalValue;
 
-  public ArrowDataTest() {
+  public ArrowData() {
     this.batchSize = 20;
     this.entries = 50;
     this.tinyIntValue = 0;