diff --git a/CMakeLists.txt b/CMakeLists.txt
index bbaf992848cd..a133cd66bc5d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -91,6 +91,7 @@ endif()
 if(${VELOX_ENABLE_BENCHMARKS} OR ${VELOX_ENABLE_BENCHMARKS_BASIC})
   set(VELOX_ENABLE_DUCKDB ON)
   set(VELOX_ENABLE_PARSE ON)
+  set(VELOX_BUILD_TEST_UTILS ON)
 endif()
 
 if(VELOX_ENABLE_S3)
@@ -313,12 +314,8 @@ if(VELOX_BUILD_TESTING AND NOT VELOX_ENABLE_DUCKDB)
   )
 endif()
 
-# Benchmarks and tests at some places are coupled which is not great. See
-# velox/vector/CMakeLists.txt. TODO: Decouple.
 set(VELOX_DISABLE_GOOGLETEST OFF)
-if(NOT VELOX_BUILD_TEST_UTILS
-   AND NOT VELOX_BUILD_TESTING
-   AND NOT VELOX_ENABLE_BENCHMARKS_BASIC)
+if(NOT VELOX_BUILD_TEST_UTILS AND NOT VELOX_BUILD_TESTING)
   set(VELOX_DISABLE_GOOGLETEST ON)
   add_definitions(-DVELOX_DISABLE_GOOGLETEST)
 endif()
diff --git a/velox/benchmarks/CMakeLists.txt b/velox/benchmarks/CMakeLists.txt
index b339fe6cdf80..e3d7e30368b8 100644
--- a/velox/benchmarks/CMakeLists.txt
+++ b/velox/benchmarks/CMakeLists.txt
@@ -11,8 +11,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
 add_subdirectory(basic)
+
 if(${VELOX_ENABLE_BENCHMARKS})
   add_subdirectory(tpch)
 endif()
diff --git a/velox/benchmarks/basic/Preproc.cpp b/velox/benchmarks/basic/Preproc.cpp
index 9a6a700058de..e50ec5cda2c7 100644
--- a/velox/benchmarks/basic/Preproc.cpp
+++ b/velox/benchmarks/basic/Preproc.cpp
@@ -22,7 +22,7 @@
 #include "velox/functions/lib/benchmarks/FunctionBenchmarkBase.h"
 #include "velox/functions/prestosql/Comparisons.h"
 #include "velox/functions/prestosql/registration/RegistrationFunctions.h"
-#include "velox/vector/tests/VectorTestBase.h"
+#include "velox/vector/tests/utils/VectorTestBase.h"
 
 using namespace facebook::velox;
 using namespace facebook::velox::exec;
diff --git a/velox/benchmarks/tpch/CMakeLists.txt b/velox/benchmarks/tpch/CMakeLists.txt
index 68232a79a51a..b0fcd1c90d77 100644
--- a/velox/benchmarks/tpch/CMakeLists.txt
+++ b/velox/benchmarks/tpch/CMakeLists.txt
@@ -18,7 +18,7 @@ target_link_libraries(
   velox_tpch_benchmark
   velox_aggregates
   velox_exec
-  velox_exec_test_util
+  velox_exec_test_lib
   velox_dwio_common
   velox_dwio_common_exception
   velox_dwio_parquet_reader
diff --git a/velox/common/file/benchmark/CMakeLists.txt b/velox/common/file/benchmark/CMakeLists.txt
index 0b44f627a6d4..fbc14b8c3680 100644
--- a/velox/common/file/benchmark/CMakeLists.txt
+++ b/velox/common/file/benchmark/CMakeLists.txt
@@ -15,7 +15,7 @@
 add_library(velox_read_benchmark_lib ReadBenchmark.cpp)
 
 target_link_libraries(velox_read_benchmark_lib velox_file velox_exception
-                      velox_exec_test_util ${FMT} ${FOLLY_WITH_DEPENDENCIES})
+                      velox_exec_test_lib ${FMT} ${FOLLY_WITH_DEPENDENCIES})
 
 add_executable(velox_read_benchmark ReadBenchmarkMain.cpp)
 
diff --git a/velox/common/file/tests/CMakeLists.txt b/velox/common/file/tests/CMakeLists.txt
index b8beb2f9744e..aa6e1a3aadb1 100644
--- a/velox/common/file/tests/CMakeLists.txt
+++ b/velox/common/file/tests/CMakeLists.txt
@@ -18,7 +18,7 @@ target_link_libraries(
   velox_file_test
   velox_file
   velox_exception
-  velox_exec_test_util
+  velox_exec_test_lib
   ${FMT}
   ${FOLLY_WITH_DEPENDENCIES}
   gtest
diff --git a/velox/connectors/hive/CMakeLists.txt b/velox/connectors/hive/CMakeLists.txt
index 9eca8a894d09..3b91864bc38f 100644
--- a/velox/connectors/hive/CMakeLists.txt
+++ b/velox/connectors/hive/CMakeLists.txt
@@ -25,5 +25,8 @@ add_subdirectory(storage_adapters)
 
 if(${VELOX_BUILD_TESTING})
   add_subdirectory(tests)
+endif()
+
+if(${VELOX_ENABLE_BENCHMARKS})
   add_subdirectory(benchmarks)
 endif()
diff --git a/velox/connectors/hive/benchmarks/CMakeLists.txt b/velox/connectors/hive/benchmarks/CMakeLists.txt
index 0e0ac42a7316..c3e65504a320 100644
--- a/velox/connectors/hive/benchmarks/CMakeLists.txt
+++ b/velox/connectors/hive/benchmarks/CMakeLists.txt
@@ -25,7 +25,7 @@ target_link_libraries(
   velox_parse_utils
   velox_parse_expression
   velox_exec
-  velox_exec_test_util
+  velox_exec_test_lib
   velox_hive_connector
   velox_hive_partition_function
   velox_memory
diff --git a/velox/connectors/hive/benchmarks/HivePartitionFunctionBenchmark.cpp b/velox/connectors/hive/benchmarks/HivePartitionFunctionBenchmark.cpp
index 02767e876419..aaa41cea5e3e 100644
--- a/velox/connectors/hive/benchmarks/HivePartitionFunctionBenchmark.cpp
+++ b/velox/connectors/hive/benchmarks/HivePartitionFunctionBenchmark.cpp
@@ -20,7 +20,7 @@
 #include "velox/type/Type.h"
 #include "velox/vector/ComplexVector.h"
 #include "velox/vector/fuzzer/VectorFuzzer.h"
-#include "velox/vector/tests/VectorMaker.h"
+#include "velox/vector/tests/utils/VectorMaker.h"
 
 DEFINE_int64(fuzzer_seed, 99887766, "Seed for random input dataset generator");
 
diff --git a/velox/connectors/hive/storage_adapters/hdfs/tests/CMakeLists.txt b/velox/connectors/hive/storage_adapters/hdfs/tests/CMakeLists.txt
index dea1e458a514..341970ef8162 100644
--- a/velox/connectors/hive/storage_adapters/hdfs/tests/CMakeLists.txt
+++ b/velox/connectors/hive/storage_adapters/hdfs/tests/CMakeLists.txt
@@ -19,7 +19,7 @@ target_link_libraries(
   velox_file
   velox_hdfs
   velox_core
-  velox_exec_test_util
+  velox_exec_test_lib
   velox_hive_connector
   velox_dwio_common_exception
   velox_exec
diff --git a/velox/connectors/hive/storage_adapters/s3fs/benchmark/CMakeLists.txt b/velox/connectors/hive/storage_adapters/s3fs/benchmark/CMakeLists.txt
index debf39545d4c..2894cf0ffb58 100644
--- a/velox/connectors/hive/storage_adapters/s3fs/benchmark/CMakeLists.txt
+++ b/velox/connectors/hive/storage_adapters/s3fs/benchmark/CMakeLists.txt
@@ -20,6 +20,6 @@ target_link_libraries(
   velox_read_benchmark_lib
   velox_s3fs
   velox_exception
-  velox_exec_test_util
+  velox_exec_test_lib
   ${FMT}
   ${FOLLY_WITH_DEPENDENCIES})
diff --git a/velox/connectors/hive/storage_adapters/s3fs/tests/CMakeLists.txt b/velox/connectors/hive/storage_adapters/s3fs/tests/CMakeLists.txt
index b15588ce46a7..b9dabecc1f73 100644
--- a/velox/connectors/hive/storage_adapters/s3fs/tests/CMakeLists.txt
+++ b/velox/connectors/hive/storage_adapters/s3fs/tests/CMakeLists.txt
@@ -19,7 +19,7 @@ target_link_libraries(
   velox_file
   velox_s3fs
   velox_core
-  velox_exec_test_util
+  velox_exec_test_lib
   velox_hive_connector
   velox_dwio_common_exception
   velox_exec
diff --git a/velox/connectors/hive/tests/CMakeLists.txt b/velox/connectors/hive/tests/CMakeLists.txt
index 4d668bda75a2..ddf46ba568d3 100644
--- a/velox/connectors/hive/tests/CMakeLists.txt
+++ b/velox/connectors/hive/tests/CMakeLists.txt
@@ -22,6 +22,6 @@ target_link_libraries(
   velox_dwio_common_exception
   velox_vector_test_lib
   velox_exec
-  velox_exec_test_util
+  velox_exec_test_lib
   gtest
   gtest_main)
diff --git a/velox/connectors/hive/tests/HivePartitionFunctionTest.cpp b/velox/connectors/hive/tests/HivePartitionFunctionTest.cpp
index 1d3d8af4a04f..52646408f23c 100644
--- a/velox/connectors/hive/tests/HivePartitionFunctionTest.cpp
+++ b/velox/connectors/hive/tests/HivePartitionFunctionTest.cpp
@@ -15,7 +15,7 @@
  */
 #include "velox/connectors/hive/HivePartitionFunction.h"
 #include "gtest/gtest.h"
-#include "velox/vector/tests/VectorMaker.h"
+#include "velox/vector/tests/utils/VectorMaker.h"
 
 using namespace facebook::velox;
 
diff --git a/velox/connectors/tpch/tests/CMakeLists.txt b/velox/connectors/tpch/tests/CMakeLists.txt
index 5a8e16a20bb2..a6499b9f4f0c 100644
--- a/velox/connectors/tpch/tests/CMakeLists.txt
+++ b/velox/connectors/tpch/tests/CMakeLists.txt
@@ -19,7 +19,7 @@ target_link_libraries(
   velox_tpch_connector_test
   velox_tpch_connector
   velox_vector_test_lib
-  velox_exec_test_util
+  velox_exec_test_lib
   velox_aggregates
   gtest
   gtest_main)
@@ -27,4 +27,4 @@ target_link_libraries(
 add_executable(velox_tpch_speed_test SpeedTest.cpp)
 
 target_link_libraries(velox_tpch_speed_test velox_tpch_connector velox_exec
-                      velox_exec_test_util velox_memory ${FMT})
+                      velox_exec_test_lib velox_memory ${FMT})
diff --git a/velox/duckdb/conversion/tests/DuckWrapperTest.cpp b/velox/duckdb/conversion/tests/DuckWrapperTest.cpp
index d5fd02c9dea2..fd69ec8e561b 100644
--- a/velox/duckdb/conversion/tests/DuckWrapperTest.cpp
+++ b/velox/duckdb/conversion/tests/DuckWrapperTest.cpp
@@ -15,7 +15,7 @@
  */
 #include "velox/duckdb/conversion/DuckWrapper.h"
 #include "velox/external/duckdb/duckdb.hpp"
-#include "velox/vector/tests/VectorMaker.h"
+#include "velox/vector/tests/utils/VectorMaker.h"
 
 #include <gtest/gtest.h>
 
diff --git a/velox/duckdb/functions/tests/CMakeLists.txt b/velox/duckdb/functions/tests/CMakeLists.txt
index 9a2daa33c23f..10b788272831 100644
--- a/velox/duckdb/functions/tests/CMakeLists.txt
+++ b/velox/duckdb/functions/tests/CMakeLists.txt
@@ -23,7 +23,7 @@ target_link_libraries(
   velox_functions_prestosql
   velox_functions_lib
   velox_functions_test_lib
-  velox_exec_test_util
+  velox_exec_test_lib
   gtest
   gtest_main
   ${gflags_LIBRARIES})
diff --git a/velox/duckdb/functions/tests/DuckFunctionTest.cpp b/velox/duckdb/functions/tests/DuckFunctionTest.cpp
index ca507f9718cb..0ced66e92c2f 100644
--- a/velox/duckdb/functions/tests/DuckFunctionTest.cpp
+++ b/velox/duckdb/functions/tests/DuckFunctionTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 #include "velox/duckdb/functions/DuckFunctions.h"
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 
 using namespace facebook::velox;
 
diff --git a/velox/dwio/dwrf/test/ColumnWriterTests.cpp b/velox/dwio/dwrf/test/ColumnWriterTests.cpp
index c547fb3bdc25..7279963d3900 100644
--- a/velox/dwio/dwrf/test/ColumnWriterTests.cpp
+++ b/velox/dwio/dwrf/test/ColumnWriterTests.cpp
@@ -32,7 +32,7 @@
 #include "velox/dwio/dwrf/writer/Writer.h"
 #include "velox/type/Type.h"
 #include "velox/vector/DictionaryVector.h"
-#include "velox/vector/tests/VectorMaker.h"
+#include "velox/vector/tests/utils/VectorMaker.h"
 
 using namespace ::testing;
 using namespace facebook::velox::dwio::common;
diff --git a/velox/dwio/dwrf/test/E2EWriterTests.cpp b/velox/dwio/dwrf/test/E2EWriterTests.cpp
index 5e50ee63fe40..fd2fcb879bf7 100644
--- a/velox/dwio/dwrf/test/E2EWriterTests.cpp
+++ b/velox/dwio/dwrf/test/E2EWriterTests.cpp
@@ -28,7 +28,7 @@
 #include "velox/dwio/type/fbhive/HiveTypeParser.h"
 #include "velox/vector/FlatVector.h"
 #include "velox/vector/fuzzer/VectorFuzzer.h"
-#include "velox/vector/tests/VectorMaker.h"
+#include "velox/vector/tests/utils/VectorMaker.h"
 
 using namespace ::testing;
 using namespace facebook::velox::dwio::common;
diff --git a/velox/dwio/parquet/tests/ParquetReaderTestBase.h b/velox/dwio/parquet/tests/ParquetReaderTestBase.h
index bf07efb1ab76..9ed1a08443bf 100644
--- a/velox/dwio/parquet/tests/ParquetReaderTestBase.h
+++ b/velox/dwio/parquet/tests/ParquetReaderTestBase.h
@@ -17,7 +17,7 @@
 #pragma once
 
 #include "velox/dwio/common/tests/utils/DataFiles.h"
-#include "velox/vector/tests/VectorMaker.h"
+#include "velox/vector/tests/utils/VectorMaker.h"
 
 #include <gtest/gtest.h>
 
diff --git a/velox/dwio/parquet/tests/duckdb_reader/CMakeLists.txt b/velox/dwio/parquet/tests/duckdb_reader/CMakeLists.txt
index 746c1dcf04ad..6625ec250ada 100644
--- a/velox/dwio/parquet/tests/duckdb_reader/CMakeLists.txt
+++ b/velox/dwio/parquet/tests/duckdb_reader/CMakeLists.txt
@@ -32,7 +32,7 @@ add_test(
 target_link_libraries(
   velox_dwio_duckdb_parquet_table_scan_test
   velox_dwio_parquet_reader
-  velox_exec_test_util
+  velox_exec_test_lib
   velox_exec
   velox_hive_connector
   velox_aggregates
@@ -48,7 +48,7 @@ add_test(
 target_link_libraries(
   velox_dwio_duckdb_parquet_tpch_test
   velox_dwio_parquet_reader
-  velox_exec_test_util
+  velox_exec_test_lib
   velox_exec
   velox_hive_connector
   velox_aggregates
diff --git a/velox/dwio/parquet/tests/reader/CMakeLists.txt b/velox/dwio/parquet/tests/reader/CMakeLists.txt
index 5f0e91229616..682f56de9a22 100644
--- a/velox/dwio/parquet/tests/reader/CMakeLists.txt
+++ b/velox/dwio/parquet/tests/reader/CMakeLists.txt
@@ -43,7 +43,7 @@ add_test(
 target_link_libraries(
   velox_dwio_parquet_tpch_test
   velox_dwio_parquet_reader
-  velox_exec_test_util
+  velox_exec_test_lib
   velox_exec
   velox_hive_connector
   velox_aggregates
diff --git a/velox/examples/CMakeLists.txt b/velox/examples/CMakeLists.txt
index 2aad7251cfd0..b392e2d22f30 100644
--- a/velox/examples/CMakeLists.txt
+++ b/velox/examples/CMakeLists.txt
@@ -35,7 +35,7 @@ target_link_libraries(
   velox_type
   velox_vector
   velox_exec
-  velox_exec_test_util
+  velox_exec_test_lib
   velox_hive_connector
   velox_memory)
 
@@ -46,6 +46,6 @@ target_link_libraries(
   velox_type
   velox_vector
   velox_exec
-  velox_exec_test_util
+  velox_exec_test_lib
   velox_hive_connector
   velox_memory)
diff --git a/velox/exec/CMakeLists.txt b/velox/exec/CMakeLists.txt
index c7d3c71272fa..29fd2655f6c4 100644
--- a/velox/exec/CMakeLists.txt
+++ b/velox/exec/CMakeLists.txt
@@ -73,7 +73,10 @@ target_link_libraries(
 
 if(${VELOX_BUILD_TESTING})
   add_subdirectory(tests)
-  add_subdirectory(benchmarks)
 elseif(${VELOX_BUILD_TEST_UTILS})
   add_subdirectory(tests/utils)
 endif()
+
+if(${VELOX_ENABLE_BENCHMARKS})
+  add_subdirectory(benchmarks)
+endif()
diff --git a/velox/exec/benchmarks/VectorHasherBenchmark.cpp b/velox/exec/benchmarks/VectorHasherBenchmark.cpp
index d816599792d6..5499a4347944 100644
--- a/velox/exec/benchmarks/VectorHasherBenchmark.cpp
+++ b/velox/exec/benchmarks/VectorHasherBenchmark.cpp
@@ -16,7 +16,7 @@
 #include <folly/Benchmark.h>
 #include <folly/init/Init.h>
 #include "velox/exec/VectorHasher.h"
-#include "velox/vector/tests/VectorMaker.h"
+#include "velox/vector/tests/utils/VectorMaker.h"
 
 using namespace facebook::velox;
 using namespace facebook::velox::exec;
diff --git a/velox/exec/tests/CMakeLists.txt b/velox/exec/tests/CMakeLists.txt
index 52f1216810ed..5316a1a9afd5 100644
--- a/velox/exec/tests/CMakeLists.txt
+++ b/velox/exec/tests/CMakeLists.txt
@@ -79,7 +79,7 @@ target_link_libraries(
   velox_test_util
   velox_type
   velox_serialization
-  velox_exec_test_util
+  velox_exec_test_lib
   velox_functions_json
   velox_vector
   velox_vector_fuzzer
@@ -112,6 +112,6 @@ target_link_libraries(
   velox_vector
   velox_vector_test_lib
   velox_exec
-  velox_exec_test_util
+  velox_exec_test_lib
   velox_tpch_connector
   velox_memory)
diff --git a/velox/exec/tests/FunctionResolutionTest.cpp b/velox/exec/tests/FunctionResolutionTest.cpp
index d31ce5727d70..3043fe0e2159 100644
--- a/velox/exec/tests/FunctionResolutionTest.cpp
+++ b/velox/exec/tests/FunctionResolutionTest.cpp
@@ -16,7 +16,7 @@
 
 #include "velox/functions/Udf.h"
 #include "velox/functions/prestosql/registration/RegistrationFunctions.h"
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 
 namespace {
 using namespace facebook::velox;
diff --git a/velox/exec/tests/FunctionSignatureBuilderTest.cpp b/velox/exec/tests/FunctionSignatureBuilderTest.cpp
index bb33ff0777b7..abf7c4b70eb6 100644
--- a/velox/exec/tests/FunctionSignatureBuilderTest.cpp
+++ b/velox/exec/tests/FunctionSignatureBuilderTest.cpp
@@ -15,7 +15,7 @@
  */
 #include <gtest/gtest.h>
 #include "velox/expression/FunctionSignature.h"
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 
 using namespace facebook::velox;
 using namespace facebook::velox::exec;
diff --git a/velox/exec/tests/HashBitRangeTest.cpp b/velox/exec/tests/HashBitRangeTest.cpp
index cdc21c327887..207394ce482d 100644
--- a/velox/exec/tests/HashBitRangeTest.cpp
+++ b/velox/exec/tests/HashBitRangeTest.cpp
@@ -15,7 +15,7 @@
  */
 
 #include "velox/exec/HashBitRange.h"
-#include "velox/vector/tests/VectorTestBase.h"
+#include "velox/vector/tests/utils/VectorTestBase.h"
 
 using namespace facebook::velox;
 using namespace facebook::velox::exec;
diff --git a/velox/exec/tests/HashPartitionFunctionTest.cpp b/velox/exec/tests/HashPartitionFunctionTest.cpp
index c57cd4622a28..db3ff160738c 100644
--- a/velox/exec/tests/HashPartitionFunctionTest.cpp
+++ b/velox/exec/tests/HashPartitionFunctionTest.cpp
@@ -15,7 +15,7 @@
  */
 
 #include "velox/exec/HashPartitionFunction.h"
-#include "velox/vector/tests/VectorTestBase.h"
+#include "velox/vector/tests/utils/VectorTestBase.h"
 
 using namespace facebook::velox;
 using namespace facebook::velox::exec;
diff --git a/velox/exec/tests/HashTableTest.cpp b/velox/exec/tests/HashTableTest.cpp
index 4e71dacd801d..0ab4713172cd 100644
--- a/velox/exec/tests/HashTableTest.cpp
+++ b/velox/exec/tests/HashTableTest.cpp
@@ -17,7 +17,7 @@
 #include "velox/exec/HashTable.h"
 #include "velox/common/base/SelectivityInfo.h"
 #include "velox/exec/VectorHasher.h"
-#include "velox/vector/tests/VectorMaker.h"
+#include "velox/vector/tests/utils/VectorMaker.h"
 
 #include <gtest/gtest.h>
 #include <memory>
diff --git a/velox/exec/tests/OrderByTest.cpp b/velox/exec/tests/OrderByTest.cpp
index b0d8cbfd5850..8964d366903f 100644
--- a/velox/exec/tests/OrderByTest.cpp
+++ b/velox/exec/tests/OrderByTest.cpp
@@ -22,7 +22,7 @@
 #include "velox/exec/tests/utils/PlanBuilder.h"
 #include "velox/exec/tests/utils/QueryAssertions.h"
 #include "velox/exec/tests/utils/TempDirectoryPath.h"
-#include "velox/vector/tests/VectorMaker.h"
+#include "velox/vector/tests/utils/VectorMaker.h"
 
 using namespace facebook::velox;
 using namespace facebook::velox::exec;
diff --git a/velox/exec/tests/PlanBuilderTest.cpp b/velox/exec/tests/PlanBuilderTest.cpp
index e3c6f2430fe3..375a145d2ce3 100644
--- a/velox/exec/tests/PlanBuilderTest.cpp
+++ b/velox/exec/tests/PlanBuilderTest.cpp
@@ -18,7 +18,7 @@
 #include "velox/exec/WindowFunction.h"
 #include "velox/functions/prestosql/registration/RegistrationFunctions.h"
 #include "velox/parse/TypeResolver.h"
-#include "velox/vector/tests/VectorTestBase.h"
+#include "velox/vector/tests/utils/VectorTestBase.h"
 
 namespace facebook::velox::exec::test {
 
diff --git a/velox/exec/tests/PlanNodeToStringTest.cpp b/velox/exec/tests/PlanNodeToStringTest.cpp
index 0ac3e4854ea6..3bd2b19ccbff 100644
--- a/velox/exec/tests/PlanNodeToStringTest.cpp
+++ b/velox/exec/tests/PlanNodeToStringTest.cpp
@@ -19,7 +19,7 @@
 #include "velox/exec/tests/utils/PlanBuilder.h"
 #include "velox/functions/prestosql/registration/RegistrationFunctions.h"
 #include "velox/parse/TypeResolver.h"
-#include "velox/vector/tests/VectorTestBase.h"
+#include "velox/vector/tests/utils/VectorTestBase.h"
 
 #include <gtest/gtest.h>
 
diff --git a/velox/exec/tests/RoundRobinPartitionFunctionTest.cpp b/velox/exec/tests/RoundRobinPartitionFunctionTest.cpp
index e138cf475ce4..0994b7cbc408 100644
--- a/velox/exec/tests/RoundRobinPartitionFunctionTest.cpp
+++ b/velox/exec/tests/RoundRobinPartitionFunctionTest.cpp
@@ -15,7 +15,7 @@
  */
 #include "velox/exec/RoundRobinPartitionFunction.h"
 #include <gtest/gtest.h>
-#include "velox/vector/tests/VectorMaker.h"
+#include "velox/vector/tests/utils/VectorMaker.h"
 
 using namespace facebook::velox;
 
diff --git a/velox/exec/tests/SpillTest.cpp b/velox/exec/tests/SpillTest.cpp
index 2476c2c693ec..06e3bbb578d3 100644
--- a/velox/exec/tests/SpillTest.cpp
+++ b/velox/exec/tests/SpillTest.cpp
@@ -20,7 +20,7 @@
 #include "velox/common/file/FileSystems.h"
 #include "velox/exec/tests/utils/TempDirectoryPath.h"
 #include "velox/serializers/PrestoSerializer.h"
-#include "velox/vector/tests/VectorTestBase.h"
+#include "velox/vector/tests/utils/VectorTestBase.h"
 
 using namespace facebook::velox;
 using namespace facebook::velox::exec;
diff --git a/velox/exec/tests/UnorderedStreamReaderTest.cpp b/velox/exec/tests/UnorderedStreamReaderTest.cpp
index ab1a04642c4b..c30ad8116776 100644
--- a/velox/exec/tests/UnorderedStreamReaderTest.cpp
+++ b/velox/exec/tests/UnorderedStreamReaderTest.cpp
@@ -16,7 +16,7 @@
 
 #include "velox/exec/UnorderedStreamReader.h"
 #include "velox/vector/fuzzer/VectorFuzzer.h"
-#include "velox/vector/tests/VectorTestBase.h"
+#include "velox/vector/tests/utils/VectorTestBase.h"
 
 using namespace facebook::velox;
 
diff --git a/velox/exec/tests/VectorHasherTest.cpp b/velox/exec/tests/VectorHasherTest.cpp
index f88a3f65b4f6..cd96ad7be42e 100644
--- a/velox/exec/tests/VectorHasherTest.cpp
+++ b/velox/exec/tests/VectorHasherTest.cpp
@@ -16,7 +16,7 @@
 #include "velox/exec/VectorHasher.h"
 #include <gtest/gtest.h>
 #include "velox/type/Type.h"
-#include "velox/vector/tests/VectorMaker.h"
+#include "velox/vector/tests/utils/VectorMaker.h"
 
 using namespace facebook::velox;
 using namespace facebook::velox::exec;
diff --git a/velox/exec/tests/VeloxIn10MinDemo.cpp b/velox/exec/tests/VeloxIn10MinDemo.cpp
index b12ecd85219a..35f2bcfd7717 100644
--- a/velox/exec/tests/VeloxIn10MinDemo.cpp
+++ b/velox/exec/tests/VeloxIn10MinDemo.cpp
@@ -25,7 +25,7 @@
 #include "velox/parse/ExpressionsParser.h"
 #include "velox/parse/TypeResolver.h"
 #include "velox/tpch/gen/TpchGen.h"
-#include "velox/vector/tests/VectorTestBase.h"
+#include "velox/vector/tests/utils/VectorTestBase.h"
 
 using namespace facebook::velox;
 using namespace facebook::velox::test;
diff --git a/velox/exec/tests/utils/CMakeLists.txt b/velox/exec/tests/utils/CMakeLists.txt
index ce2544681b1c..3182a0baff33 100644
--- a/velox/exec/tests/utils/CMakeLists.txt
+++ b/velox/exec/tests/utils/CMakeLists.txt
@@ -17,7 +17,7 @@ add_library(velox_temp_path TempFilePath.cpp TempDirectoryPath.cpp)
 target_link_libraries(velox_temp_path velox_exception)
 
 add_library(
-  velox_exec_test_util
+  velox_exec_test_lib
   AssertQueryBuilder.cpp
   Cursor.cpp
   HiveConnectorTestBase.cpp
@@ -28,7 +28,7 @@ add_library(
   TpchQueryBuilder.cpp)
 
 target_link_libraries(
-  velox_exec_test_util
+  velox_exec_test_lib
   velox_temp_path
   velox_core
   velox_exception
diff --git a/velox/exec/tests/utils/OperatorTestBase.h b/velox/exec/tests/utils/OperatorTestBase.h
index e92d1205bcf2..eddcdce22123 100644
--- a/velox/exec/tests/utils/OperatorTestBase.h
+++ b/velox/exec/tests/utils/OperatorTestBase.h
@@ -23,8 +23,8 @@
 #include "velox/parse/ExpressionsParser.h"
 #include "velox/type/Variant.h"
 #include "velox/vector/FlatVector.h"
-#include "velox/vector/tests/VectorMaker.h"
-#include "velox/vector/tests/VectorTestBase.h"
+#include "velox/vector/tests/utils/VectorMaker.h"
+#include "velox/vector/tests/utils/VectorTestBase.h"
 
 namespace facebook::velox::exec::test {
 class OperatorTestBase : public testing::Test,
diff --git a/velox/exec/tests/utils/RowContainerTestBase.h b/velox/exec/tests/utils/RowContainerTestBase.h
index a02ab2ac22a4..8a19fca18768 100644
--- a/velox/exec/tests/utils/RowContainerTestBase.h
+++ b/velox/exec/tests/utils/RowContainerTestBase.h
@@ -24,8 +24,8 @@
 #include "velox/exec/VectorHasher.h"
 #include "velox/exec/tests/utils/TempDirectoryPath.h"
 #include "velox/serializers/PrestoSerializer.h"
-#include "velox/vector/tests/VectorMaker.h"
-#include "velox/vector/tests/VectorTestBase.h"
+#include "velox/vector/tests/utils/VectorMaker.h"
+#include "velox/vector/tests/utils/VectorTestBase.h"
 
 namespace facebook::velox::exec::test {
 
diff --git a/velox/experimental/codegen/benchmark/CMakeLists.txt b/velox/experimental/codegen/benchmark/CMakeLists.txt
index 86093177d7a9..94ba42a99ada 100644
--- a/velox/experimental/codegen/benchmark/CMakeLists.txt
+++ b/velox/experimental/codegen/benchmark/CMakeLists.txt
@@ -19,7 +19,7 @@ add_executable(
 
 target_link_libraries(
   velox_codegen_benchmark_single_output
-  velox_exec_test_util
+  velox_exec_test_lib
   velox_codegen_utils_resource_path
   velox_codegen_code_generator
   velox_hive_connector
@@ -32,7 +32,7 @@ target_link_libraries(
   ${FMT}
   velox_core
   velox_exec
-  velox_exec_test_util
+  velox_exec_test_lib
   velox_functions_lib
   velox_functions_prestosql
   velox_dwio_common_test_utils)
@@ -85,7 +85,7 @@ add_compile_definitions(velox_codegen_test GFLAGS_LI="${GFLAGS_INCLUDES}")
 
 target_link_libraries(
   velox_codegen_benchmark
-  velox_exec_test_util
+  velox_exec_test_lib
   velox_codegen_code_generator
   ${FOLLY_BENCHMARK}
   ${FOLLY_WITH_DEPENDENCIES}
@@ -98,7 +98,7 @@ target_link_libraries(
   velox_core
   velox_exec
   velox_codegen_utils_resource_path
-  velox_exec_test_util
+  velox_exec_test_lib
   velox_functions_lib
   velox_functions_prestosql
   velox_dwio_common_test_utils)
diff --git a/velox/experimental/codegen/code_generator/CMakeLists.txt b/velox/experimental/codegen/code_generator/CMakeLists.txt
index 050610f0971b..dd8bea676fc1 100644
--- a/velox/experimental/codegen/code_generator/CMakeLists.txt
+++ b/velox/experimental/codegen/code_generator/CMakeLists.txt
@@ -19,7 +19,7 @@ target_link_libraries(
   velox_codegen_utils_resource_path
   velox_core
   velox_parse_parser
-  velox_exec_test_util
+  velox_exec_test_lib
   velox_functions_lib
   velox_functions_prestosql_impl
   ${FOLLY_WITH_DEPENDENCIES}
diff --git a/velox/experimental/codegen/code_generator/tests/CMakeLists.txt b/velox/experimental/codegen/code_generator/tests/CMakeLists.txt
index 7ad765c86c33..f637d406e3b9 100644
--- a/velox/experimental/codegen/code_generator/tests/CMakeLists.txt
+++ b/velox/experimental/codegen/code_generator/tests/CMakeLists.txt
@@ -40,7 +40,7 @@ target_link_libraries(
   ${FMT}
   velox_core
   velox_parse_parser
-  velox_exec_test_util
+  velox_exec_test_lib
   velox_functions_lib
   velox_functions_prestosql
   velox_all_link)
@@ -59,7 +59,7 @@ target_link_libraries(
   ${FMT}
   velox_core
   velox_parse_parser
-  velox_exec_test_util
+  velox_exec_test_lib
   velox_functions_lib
   velox_functions_prestosql
   velox_all_link)
diff --git a/velox/experimental/codegen/tests/CMakeLists.txt b/velox/experimental/codegen/tests/CMakeLists.txt
index dc1531f0735e..b3f91ca078d4 100644
--- a/velox/experimental/codegen/tests/CMakeLists.txt
+++ b/velox/experimental/codegen/tests/CMakeLists.txt
@@ -21,7 +21,7 @@ target_link_libraries(
   velox_core
   velox_exec
   velox_experimental_codegen
-  velox_exec_test_util
+  velox_exec_test_lib
   velox_functions_prestosql
   velox_hive_connector
   velox_codegen_utils_resource_path)
diff --git a/velox/experimental/codegen/tests/TARGETS_disabled b/velox/experimental/codegen/tests/TARGETS_disabled
index 58648e05355c..10d2c6c2a239 100644
--- a/velox/experimental/codegen/tests/TARGETS_disabled
+++ b/velox/experimental/codegen/tests/TARGETS_disabled
@@ -13,7 +13,7 @@ cpp_library(
         "//velox/core:velox_core",
         "//velox/dwio/common/tests/utils:lib_test_batch_maker",
         "//velox/exec:velox_exec_lib",
-        "//velox/exec/tests/utils:velox_exec_test_util",
+        "//velox/exec/tests/utils:velox_exec_test_lib",
         "//velox/experimental/codegen:velox_experimental_codegen_header",
         "//velox/experimental/codegen:velox_experimental_codegen_impl",
         "//velox/experimental/codegen/code_generator:velox_codegen_code_generator",
diff --git a/velox/experimental/codegen/vector_function/tests/CMakeLists.txt b/velox/experimental/codegen/vector_function/tests/CMakeLists.txt
index 497c810f328a..919a3f51b579 100644
--- a/velox/experimental/codegen/vector_function/tests/CMakeLists.txt
+++ b/velox/experimental/codegen/vector_function/tests/CMakeLists.txt
@@ -32,7 +32,7 @@ target_link_libraries(
   velox_core
   velox_type
   velox_serialization
-  velox_exec_test_util
+  velox_exec_test_lib
   velox_functions_json
   velox_vector
   velox_memory
diff --git a/velox/expression/benchmarks/CMakeLists.txt b/velox/expression/benchmarks/CMakeLists.txt
index e838bd9a5d85..9bfeb01a78e0 100644
--- a/velox/expression/benchmarks/CMakeLists.txt
+++ b/velox/expression/benchmarks/CMakeLists.txt
@@ -13,8 +13,8 @@
 # limitations under the License.
 
 set(BENCHMARK_DEPENDENCIES
-    velox_functions_test_lib velox_exec velox_exec_test_util
-    ${gflags_LIBRARIES} ${FOLLY_WITH_DEPENDENCIES} ${FOLLY_BENCHMARK})
+    velox_functions_test_lib velox_exec velox_exec_test_lib ${gflags_LIBRARIES}
+    ${FOLLY_WITH_DEPENDENCIES} ${FOLLY_BENCHMARK})
 
 add_executable(velox_benchmark_call_null_free_no_nulls
                CallNullFreeBenchmark.cpp)
diff --git a/velox/expression/tests/ArrayViewTest.cpp b/velox/expression/tests/ArrayViewTest.cpp
index 104612ce0d6f..0fb07d844881 100644
--- a/velox/expression/tests/ArrayViewTest.cpp
+++ b/velox/expression/tests/ArrayViewTest.cpp
@@ -20,7 +20,7 @@
 #include "velox/common/base/VeloxException.h"
 #include "velox/expression/VectorReaders.h"
 #include "velox/functions/Udf.h"
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 
 namespace {
 
diff --git a/velox/expression/tests/ArrayWriterTest.cpp b/velox/expression/tests/ArrayWriterTest.cpp
index f64203e53af8..ea4a7b8c01cb 100644
--- a/velox/expression/tests/ArrayWriterTest.cpp
+++ b/velox/expression/tests/ArrayWriterTest.cpp
@@ -20,7 +20,7 @@
 
 #include "velox/expression/VectorWriters.h"
 #include "velox/functions/Udf.h"
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 #include "velox/type/StringView.h"
 #include "velox/type/Type.h"
 
diff --git a/velox/expression/tests/CMakeLists.txt b/velox/expression/tests/CMakeLists.txt
index e75d23ad1fd7..d4c0e8b4bc92 100644
--- a/velox/expression/tests/CMakeLists.txt
+++ b/velox/expression/tests/CMakeLists.txt
@@ -53,7 +53,7 @@ target_link_libraries(
   velox_hive_connector
   velox_dwio_common
   velox_dwio_common_exception
-  velox_exec_test_util
+  velox_exec_test_lib
   velox_expression
   velox_functions_lib
   velox_functions_prestosql
diff --git a/velox/expression/tests/CastExprTest.cpp b/velox/expression/tests/CastExprTest.cpp
index 82e3437e5b02..9c41fed14462 100644
--- a/velox/expression/tests/CastExprTest.cpp
+++ b/velox/expression/tests/CastExprTest.cpp
@@ -20,7 +20,7 @@
 #include "velox/common/base/tests/GTestUtils.h"
 #include "velox/common/memory/Memory.h"
 #include "velox/expression/VectorFunction.h"
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 #include "velox/type/Type.h"
 #include "velox/vector/BaseVector.h"
 #include "velox/vector/TypeAliases.h"
diff --git a/velox/expression/tests/CoalesceTest.cpp b/velox/expression/tests/CoalesceTest.cpp
index 8c32645dce2f..7c25a491f8a8 100644
--- a/velox/expression/tests/CoalesceTest.cpp
+++ b/velox/expression/tests/CoalesceTest.cpp
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 
 using namespace facebook::velox;
 using namespace facebook::velox::test;
diff --git a/velox/expression/tests/ConstantFlatVectorReaderTest.cpp b/velox/expression/tests/ConstantFlatVectorReaderTest.cpp
index 1a5e1c45b306..37cff6a03be5 100644
--- a/velox/expression/tests/ConstantFlatVectorReaderTest.cpp
+++ b/velox/expression/tests/ConstantFlatVectorReaderTest.cpp
@@ -19,7 +19,7 @@
 #include <cstdint>
 
 #include "velox/expression/VectorReaders.h"
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 #include "velox/vector/BaseVector.h"
 
 namespace facebook::velox::exec {
diff --git a/velox/expression/tests/EvalCtxTest.cpp b/velox/expression/tests/EvalCtxTest.cpp
index f31c1b9d8d92..545afe060f5f 100644
--- a/velox/expression/tests/EvalCtxTest.cpp
+++ b/velox/expression/tests/EvalCtxTest.cpp
@@ -17,7 +17,7 @@
 #include "gtest/gtest.h"
 
 #include "velox/expression/EvalCtx.h"
-#include "velox/vector/tests/VectorTestBase.h"
+#include "velox/vector/tests/utils/VectorTestBase.h"
 
 using namespace facebook::velox;
 using namespace facebook::velox::exec;
diff --git a/velox/expression/tests/EvalSimplifiedTest.cpp b/velox/expression/tests/EvalSimplifiedTest.cpp
index 41cb208cd609..2f69380370e3 100644
--- a/velox/expression/tests/EvalSimplifiedTest.cpp
+++ b/velox/expression/tests/EvalSimplifiedTest.cpp
@@ -16,9 +16,9 @@
 
 #include "gtest/gtest.h"
 
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 #include "velox/vector/fuzzer/VectorFuzzer.h"
-#include "velox/vector/tests/VectorTestBase.h"
+#include "velox/vector/tests/utils/VectorTestBase.h"
 
 using namespace facebook::velox;
 using namespace facebook::velox::test;
diff --git a/velox/expression/tests/ExprEncodingsTest.cpp b/velox/expression/tests/ExprEncodingsTest.cpp
index a109f398fca4..ad6ee495aed0 100644
--- a/velox/expression/tests/ExprEncodingsTest.cpp
+++ b/velox/expression/tests/ExprEncodingsTest.cpp
@@ -23,7 +23,7 @@
 #include "velox/parse/ExpressionsParser.h"
 #include "velox/parse/TypeResolver.h"
 #include "velox/vector/VectorEncoding.h"
-#include "velox/vector/tests/VectorTestBase.h"
+#include "velox/vector/tests/utils/VectorTestBase.h"
 
 using namespace facebook::velox;
 
diff --git a/velox/expression/tests/ExprStatsTest.cpp b/velox/expression/tests/ExprStatsTest.cpp
index 46b66525bbcc..91811be5d63d 100644
--- a/velox/expression/tests/ExprStatsTest.cpp
+++ b/velox/expression/tests/ExprStatsTest.cpp
@@ -19,7 +19,7 @@
 #include "velox/expression/EvalCtx.h"
 #include "velox/expression/Expr.h"
 #include "velox/functions/prestosql/registration/RegistrationFunctions.h"
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 #include "velox/parse/Expressions.h"
 #include "velox/parse/ExpressionsParser.h"
 #include "velox/parse/TypeResolver.h"
diff --git a/velox/expression/tests/ExprTest.cpp b/velox/expression/tests/ExprTest.cpp
index 2aac7c142df0..675f1bdf092b 100644
--- a/velox/expression/tests/ExprTest.cpp
+++ b/velox/expression/tests/ExprTest.cpp
@@ -26,7 +26,7 @@
 #include "velox/parse/Expressions.h"
 #include "velox/parse/ExpressionsParser.h"
 #include "velox/parse/TypeResolver.h"
-#include "velox/vector/tests/VectorTestBase.h"
+#include "velox/vector/tests/utils/VectorTestBase.h"
 
 using namespace facebook::velox;
 using namespace facebook::velox::test;
diff --git a/velox/expression/tests/ExpressionFuzzer.cpp b/velox/expression/tests/ExpressionFuzzer.cpp
index 792ff02586b2..c8262ddb556a 100644
--- a/velox/expression/tests/ExpressionFuzzer.cpp
+++ b/velox/expression/tests/ExpressionFuzzer.cpp
@@ -29,7 +29,7 @@
 #include "velox/type/Type.h"
 #include "velox/vector/BaseVector.h"
 #include "velox/vector/fuzzer/VectorFuzzer.h"
-#include "velox/vector/tests/VectorMaker.h"
+#include "velox/vector/tests/utils/VectorMaker.h"
 
 DEFINE_int32(steps, 10, "Number of expressions to generate and execute.");
 
diff --git a/velox/expression/tests/GenericViewTest.cpp b/velox/expression/tests/GenericViewTest.cpp
index 37db16613467..bfc5cecfccbb 100644
--- a/velox/expression/tests/GenericViewTest.cpp
+++ b/velox/expression/tests/GenericViewTest.cpp
@@ -21,7 +21,7 @@
 #include "velox/common/base/tests/GTestUtils.h"
 #include "velox/expression/VectorReaders.h"
 #include "velox/functions/Udf.h"
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 #include "velox/type/Type.h"
 
 namespace facebook::velox {
diff --git a/velox/expression/tests/GenericWriterTest.cpp b/velox/expression/tests/GenericWriterTest.cpp
index 7c4c7e347e1d..1da38557cb4d 100644
--- a/velox/expression/tests/GenericWriterTest.cpp
+++ b/velox/expression/tests/GenericWriterTest.cpp
@@ -21,9 +21,9 @@
 #include <cstdint>
 #include "velox/expression/VectorWriters.h"
 #include "velox/functions/Udf.h"
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 #include "velox/type/Type.h"
-#include "velox/vector/tests/VectorTestBase.h"
+#include "velox/vector/tests/utils/VectorTestBase.h"
 
 using namespace facebook::velox::exec;
 
diff --git a/velox/expression/tests/MapViewTest.cpp b/velox/expression/tests/MapViewTest.cpp
index f236206c95ec..0b84bea9ba8f 100644
--- a/velox/expression/tests/MapViewTest.cpp
+++ b/velox/expression/tests/MapViewTest.cpp
@@ -21,7 +21,7 @@
 #include "velox/common/base/Exceptions.h"
 #include "velox/expression/VectorReaders.h"
 #include "velox/functions/Udf.h"
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 
 namespace {
 using namespace facebook::velox;
diff --git a/velox/expression/tests/MapWriterTest.cpp b/velox/expression/tests/MapWriterTest.cpp
index 9b38c8ef4421..d1d060d11209 100644
--- a/velox/expression/tests/MapWriterTest.cpp
+++ b/velox/expression/tests/MapWriterTest.cpp
@@ -26,7 +26,7 @@
 #include "folly/container/F14Map.h"
 #include "velox/expression/VectorWriters.h"
 #include "velox/functions/Udf.h"
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 #include "velox/type/StringView.h"
 #include "velox/type/Type.h"
 namespace facebook::velox {
diff --git a/velox/expression/tests/RowViewTest.cpp b/velox/expression/tests/RowViewTest.cpp
index 929f97b00800..51fb430fc166 100644
--- a/velox/expression/tests/RowViewTest.cpp
+++ b/velox/expression/tests/RowViewTest.cpp
@@ -17,7 +17,7 @@
 #include <optional>
 #include "gtest/gtest.h"
 #include "velox/expression/VectorReaders.h"
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 
 namespace {
 
diff --git a/velox/expression/tests/RowWriterTest.cpp b/velox/expression/tests/RowWriterTest.cpp
index b6e21484a045..b9c488089098 100644
--- a/velox/expression/tests/RowWriterTest.cpp
+++ b/velox/expression/tests/RowWriterTest.cpp
@@ -23,7 +23,7 @@
 #include "velox/core/CoreTypeSystem.h"
 #include "velox/expression/VectorWriters.h"
 #include "velox/functions/Udf.h"
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 #include "velox/type/StringView.h"
 #include "velox/type/Timestamp.h"
 #include "velox/type/Type.h"
diff --git a/velox/expression/tests/SimpleFunctionCallNullFreeTest.cpp b/velox/expression/tests/SimpleFunctionCallNullFreeTest.cpp
index a0a495b0fc11..3a98d0f16d44 100644
--- a/velox/expression/tests/SimpleFunctionCallNullFreeTest.cpp
+++ b/velox/expression/tests/SimpleFunctionCallNullFreeTest.cpp
@@ -18,7 +18,7 @@
 #include <gtest/gtest.h>
 
 #include "velox/functions/Udf.h"
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 #include "velox/type/Type.h"
 #include "velox/vector/ComplexVector.h"
 #include "velox/vector/SelectivityVector.h"
diff --git a/velox/expression/tests/SimpleFunctionInitTest.cpp b/velox/expression/tests/SimpleFunctionInitTest.cpp
index aa844bb19c64..de0caec08c99 100644
--- a/velox/expression/tests/SimpleFunctionInitTest.cpp
+++ b/velox/expression/tests/SimpleFunctionInitTest.cpp
@@ -19,7 +19,7 @@
 
 #include "velox/expression/Expr.h"
 #include "velox/functions/Udf.h"
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 #include "velox/type/Type.h"
 #include "velox/vector/BaseVector.h"
 #include "velox/vector/ComplexVector.h"
diff --git a/velox/expression/tests/SimpleFunctionPresetNullsTest.cpp b/velox/expression/tests/SimpleFunctionPresetNullsTest.cpp
index 8bfc53aa9aac..6b60d74117b6 100644
--- a/velox/expression/tests/SimpleFunctionPresetNullsTest.cpp
+++ b/velox/expression/tests/SimpleFunctionPresetNullsTest.cpp
@@ -20,7 +20,7 @@
 
 #include "velox/expression/Expr.h"
 #include "velox/functions/Udf.h"
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 #include "velox/type/StringView.h"
 #include "velox/type/Type.h"
 #include "velox/vector/BaseVector.h"
diff --git a/velox/expression/tests/SimpleFunctionTest.cpp b/velox/expression/tests/SimpleFunctionTest.cpp
index 114899e4c18c..f3f8611f0bf7 100644
--- a/velox/expression/tests/SimpleFunctionTest.cpp
+++ b/velox/expression/tests/SimpleFunctionTest.cpp
@@ -22,7 +22,7 @@
 #include "gtest/gtest.h"
 #include "velox/expression/Expr.h"
 #include "velox/functions/Udf.h"
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 #include "velox/type/Type.h"
 #include "velox/vector/BaseVector.h"
 #include "velox/vector/ComplexVector.h"
diff --git a/velox/expression/tests/StringWriterTest.cpp b/velox/expression/tests/StringWriterTest.cpp
index e99b532d36f0..1fea0fa0869a 100644
--- a/velox/expression/tests/StringWriterTest.cpp
+++ b/velox/expression/tests/StringWriterTest.cpp
@@ -18,7 +18,7 @@
 #include "folly/Range.h"
 #include "glog/logging.h"
 #include "gtest/gtest.h"
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 
 namespace facebook::velox::expressions::test {
 
diff --git a/velox/expression/tests/TryExprTest.cpp b/velox/expression/tests/TryExprTest.cpp
index 555ed14316cb..77acb360e710 100644
--- a/velox/expression/tests/TryExprTest.cpp
+++ b/velox/expression/tests/TryExprTest.cpp
@@ -18,7 +18,7 @@
 #include <gtest/gtest.h>
 
 #include "velox/functions/Udf.h"
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 #include "velox/vector/ConstantVector.h"
 
 namespace facebook::velox {
diff --git a/velox/expression/tests/VariadicViewTest.cpp b/velox/expression/tests/VariadicViewTest.cpp
index 50565d748c9b..b2d870da1d40 100644
--- a/velox/expression/tests/VariadicViewTest.cpp
+++ b/velox/expression/tests/VariadicViewTest.cpp
@@ -18,7 +18,7 @@
 #include "gtest/gtest.h"
 #include "velox/expression/VectorReaders.h"
 #include "velox/functions/Udf.h"
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 
 using namespace facebook::velox;
 using namespace facebook::velox::exec;
diff --git a/velox/expression/tests/VectorReaderTest.cpp b/velox/expression/tests/VectorReaderTest.cpp
index 372c8ccbaebe..1cf4653ac4e2 100644
--- a/velox/expression/tests/VectorReaderTest.cpp
+++ b/velox/expression/tests/VectorReaderTest.cpp
@@ -18,7 +18,7 @@
 #include <gtest/gtest.h>
 
 #include "velox/expression/VectorReaders.h"
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 
 using facebook::velox::exec::LocalDecodedVector;
 namespace facebook::velox {
diff --git a/velox/functions/lib/CMakeLists.txt b/velox/functions/lib/CMakeLists.txt
index e66e6bd9df6b..9e84381f7ebf 100644
--- a/velox/functions/lib/CMakeLists.txt
+++ b/velox/functions/lib/CMakeLists.txt
@@ -33,6 +33,9 @@ target_link_libraries(velox_functions_lib velox_vector ${RE2}
 
 add_subdirectory(string)
 if(${VELOX_BUILD_TESTING})
-  add_subdirectory(benchmarks)
   add_subdirectory(tests)
 endif()
+
+if(${VELOX_ENABLE_BENCHMARKS})
+  add_subdirectory(benchmarks)
+endif()
diff --git a/velox/functions/lib/benchmarks/CMakeLists.txt b/velox/functions/lib/benchmarks/CMakeLists.txt
index 46368dacb0fc..285fdf444065 100644
--- a/velox/functions/lib/benchmarks/CMakeLists.txt
+++ b/velox/functions/lib/benchmarks/CMakeLists.txt
@@ -16,7 +16,7 @@ add_executable(velox_re2_functions_benchmarks Re2FunctionsBenchmarks.cpp)
 target_link_libraries(
   velox_re2_functions_benchmarks
   velox_functions_lib
-  velox_exec_test_util
+  velox_exec_test_lib
   velox_expression
   velox_vector_test_lib
   velox_vector_fuzzer
diff --git a/velox/functions/lib/benchmarks/FunctionBenchmarkBase.h b/velox/functions/lib/benchmarks/FunctionBenchmarkBase.h
index 4549311dbb40..13f9163846ed 100644
--- a/velox/functions/lib/benchmarks/FunctionBenchmarkBase.h
+++ b/velox/functions/lib/benchmarks/FunctionBenchmarkBase.h
@@ -19,7 +19,7 @@
 #include "velox/parse/Expressions.h"
 #include "velox/parse/ExpressionsParser.h"
 #include "velox/parse/TypeResolver.h"
-#include "velox/vector/tests/VectorMaker.h"
+#include "velox/vector/tests/utils/VectorMaker.h"
 
 namespace facebook::velox::functions::test {
 
diff --git a/velox/functions/lib/tests/CMakeLists.txt b/velox/functions/lib/tests/CMakeLists.txt
index 8712d96d19f2..02a33eb378d2 100644
--- a/velox/functions/lib/tests/CMakeLists.txt
+++ b/velox/functions/lib/tests/CMakeLists.txt
@@ -29,7 +29,7 @@ target_link_libraries(
   velox_functions_lib_test
   velox_functions_lib
   velox_functions_test_lib
-  velox_exec_test_util
+  velox_exec_test_lib
   velox_expression
   velox_memory
   gtest
diff --git a/velox/functions/lib/tests/IsNotNullTest.cpp b/velox/functions/lib/tests/IsNotNullTest.cpp
index 6b17cc275a75..31f3a581393d 100644
--- a/velox/functions/lib/tests/IsNotNullTest.cpp
+++ b/velox/functions/lib/tests/IsNotNullTest.cpp
@@ -15,7 +15,7 @@
  */
 
 #include "velox/expression/VectorFunction.h"
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 #include "velox/parse/TypeResolver.h"
 
 namespace facebook::velox::functions {
diff --git a/velox/functions/lib/tests/IsNullTest.cpp b/velox/functions/lib/tests/IsNullTest.cpp
index 1cdb3f6691f2..732e3cbe480b 100644
--- a/velox/functions/lib/tests/IsNullTest.cpp
+++ b/velox/functions/lib/tests/IsNullTest.cpp
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 
 using namespace facebook::velox;
 using namespace facebook::velox::test;
diff --git a/velox/functions/lib/tests/Re2FunctionsTest.cpp b/velox/functions/lib/tests/Re2FunctionsTest.cpp
index 6993790ba714..3e785521e565 100644
--- a/velox/functions/lib/tests/Re2FunctionsTest.cpp
+++ b/velox/functions/lib/tests/Re2FunctionsTest.cpp
@@ -22,7 +22,7 @@
 #include <string>
 
 #include "velox/common/base/VeloxException.h"
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 #include "velox/parse/TypeResolver.h"
 #include "velox/type/StringView.h"
 #include "velox/vector/ComplexVector.h"
diff --git a/velox/functions/prestosql/CMakeLists.txt b/velox/functions/prestosql/CMakeLists.txt
index 1837ea6a17fc..a2270176adbf 100644
--- a/velox/functions/prestosql/CMakeLists.txt
+++ b/velox/functions/prestosql/CMakeLists.txt
@@ -72,8 +72,13 @@ endif()
 
 if(${VELOX_BUILD_TESTING})
   add_subdirectory(tests)
-  add_subdirectory(benchmarks)
   add_subdirectory(coverage)
+elseif(${VELOX_BUILD_TEST_UTILS})
+  add_subdirectory(tests/utils)
+endif()
+
+if(${VELOX_ENABLE_BENCHMARKS})
+  add_subdirectory(benchmarks)
 endif()
 
 add_subdirectory(registration)
diff --git a/velox/functions/prestosql/aggregates/CMakeLists.txt b/velox/functions/prestosql/aggregates/CMakeLists.txt
index 33e0970cd9ef..f9605ba30af1 100644
--- a/velox/functions/prestosql/aggregates/CMakeLists.txt
+++ b/velox/functions/prestosql/aggregates/CMakeLists.txt
@@ -12,11 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-if(${VELOX_BUILD_TESTING})
-  add_subdirectory(tests)
-  add_subdirectory(benchmarks)
-endif()
-
 add_library(
   velox_aggregates OBJECT
   AggregateNames.h
@@ -49,3 +44,11 @@ add_library(
 
 target_link_libraries(velox_aggregates velox_common_hyperloglog velox_exec
                       velox_presto_serializer ${FOLLY_WITH_DEPENDENCIES})
+
+if(${VELOX_BUILD_TESTING})
+  add_subdirectory(tests)
+endif()
+
+if(${VELOX_ENABLE_BENCHMARKS})
+  add_subdirectory(benchmarks)
+endif()
diff --git a/velox/functions/prestosql/aggregates/benchmarks/CMakeLists.txt b/velox/functions/prestosql/aggregates/benchmarks/CMakeLists.txt
index 11bb22d17e69..6e61d2764e6b 100644
--- a/velox/functions/prestosql/aggregates/benchmarks/CMakeLists.txt
+++ b/velox/functions/prestosql/aggregates/benchmarks/CMakeLists.txt
@@ -19,7 +19,7 @@ target_link_libraries(
   velox_aggregates
   velox_hive_connector
   velox_functions_lib
-  velox_exec_test_util
+  velox_exec_test_lib
   velox_functions_prestosql
   velox_dwio_common_exception
   velox_vector_fuzzer
diff --git a/velox/functions/prestosql/aggregates/tests/CMakeLists.txt b/velox/functions/prestosql/aggregates/tests/CMakeLists.txt
index 5d3b88fd69ed..763bbacefba4 100644
--- a/velox/functions/prestosql/aggregates/tests/CMakeLists.txt
+++ b/velox/functions/prestosql/aggregates/tests/CMakeLists.txt
@@ -14,7 +14,7 @@
 
 add_library(velox_aggregates_test_lib AggregationTestBase.cpp)
 
-target_link_libraries(velox_aggregates_test_lib velox_exec_test_util)
+target_link_libraries(velox_aggregates_test_lib velox_exec_test_lib)
 
 add_executable(
   velox_aggregates_test
@@ -54,7 +54,7 @@ target_link_libraries(
   velox_core
   velox_dwio_common_test_utils
   velox_exec
-  velox_exec_test_util
+  velox_exec_test_lib
   velox_file
   velox_functions_test_lib
   velox_functions_prestosql
diff --git a/velox/functions/prestosql/aggregates/tests/PrestoHasherTest.cpp b/velox/functions/prestosql/aggregates/tests/PrestoHasherTest.cpp
index 10188b07bb46..ffc0af04de89 100644
--- a/velox/functions/prestosql/aggregates/tests/PrestoHasherTest.cpp
+++ b/velox/functions/prestosql/aggregates/tests/PrestoHasherTest.cpp
@@ -19,7 +19,7 @@
 #include "velox/functions/prestosql/aggregates/PrestoHasher.h"
 #include "velox/functions/prestosql/types/TimestampWithTimeZoneType.h"
 #include "velox/type/tz/TimeZoneMap.h"
-#include "velox/vector/tests/VectorTestBase.h"
+#include "velox/vector/tests/utils/VectorTestBase.h"
 
 namespace facebook::velox::aggregate::test {
 template <typename T>
diff --git a/velox/functions/prestosql/aggregates/tests/ValueListTest.cpp b/velox/functions/prestosql/aggregates/tests/ValueListTest.cpp
index bd1670761882..6a368acbe178 100644
--- a/velox/functions/prestosql/aggregates/tests/ValueListTest.cpp
+++ b/velox/functions/prestosql/aggregates/tests/ValueListTest.cpp
@@ -15,8 +15,8 @@
  */
 #include "velox/functions/prestosql/aggregates/ValueList.h"
 #include <gtest/gtest.h>
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
-#include "velox/vector/tests/VectorMaker.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
+#include "velox/vector/tests/utils/VectorMaker.h"
 
 using namespace facebook::velox;
 using namespace facebook::velox::test;
diff --git a/velox/functions/prestosql/benchmarks/CMakeLists.txt b/velox/functions/prestosql/benchmarks/CMakeLists.txt
index 998c0200d00c..b80eb8ed4e61 100644
--- a/velox/functions/prestosql/benchmarks/CMakeLists.txt
+++ b/velox/functions/prestosql/benchmarks/CMakeLists.txt
@@ -13,8 +13,8 @@
 # limitations under the License.
 
 set(BENCHMARK_DEPENDENCIES_NO_FUNC
-    velox_functions_test_lib velox_exec velox_exec_test_util
-    ${gflags_LIBRARIES} ${FOLLY_WITH_DEPENDENCIES} ${FOLLY_BENCHMARK})
+    velox_functions_test_lib velox_exec velox_exec_test_lib ${gflags_LIBRARIES}
+    ${FOLLY_WITH_DEPENDENCIES} ${FOLLY_BENCHMARK})
 
 set(BENCHMARK_DEPENDENCIES
     velox_functions_prestosql velox_functions_lib velox_vector_fuzzer
diff --git a/velox/functions/prestosql/tests/ArithmeticTest.cpp b/velox/functions/prestosql/tests/ArithmeticTest.cpp
index c620af4edb0a..8b489ee9d220 100644
--- a/velox/functions/prestosql/tests/ArithmeticTest.cpp
+++ b/velox/functions/prestosql/tests/ArithmeticTest.cpp
@@ -19,7 +19,7 @@
 
 #include <velox/common/base/VeloxException.h>
 #include <velox/vector/SimpleVector.h>
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 
 namespace facebook::velox {
 namespace {
diff --git a/velox/functions/prestosql/tests/ArrayCombinationsTest.cpp b/velox/functions/prestosql/tests/ArrayCombinationsTest.cpp
index f1e036ccc20d..26754bd441bc 100644
--- a/velox/functions/prestosql/tests/ArrayCombinationsTest.cpp
+++ b/velox/functions/prestosql/tests/ArrayCombinationsTest.cpp
@@ -15,7 +15,7 @@
  */
 
 #include "velox/common/base/tests/GTestUtils.h"
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 
 using namespace facebook::velox;
 using namespace facebook::velox::test;
diff --git a/velox/functions/prestosql/tests/ArrayConstructorTest.cpp b/velox/functions/prestosql/tests/ArrayConstructorTest.cpp
index 479a79769d65..fe9626b270a6 100644
--- a/velox/functions/prestosql/tests/ArrayConstructorTest.cpp
+++ b/velox/functions/prestosql/tests/ArrayConstructorTest.cpp
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 
 using namespace facebook::velox;
 
diff --git a/velox/functions/prestosql/tests/ArrayContainsTest.cpp b/velox/functions/prestosql/tests/ArrayContainsTest.cpp
index 08785e9af2a0..11905f821417 100644
--- a/velox/functions/prestosql/tests/ArrayContainsTest.cpp
+++ b/velox/functions/prestosql/tests/ArrayContainsTest.cpp
@@ -15,7 +15,7 @@
  */
 
 #include <optional>
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 #include "velox/vector/BaseVector.h"
 #include "velox/vector/SelectivityVector.h"
 
diff --git a/velox/functions/prestosql/tests/ArrayDistinctTest.cpp b/velox/functions/prestosql/tests/ArrayDistinctTest.cpp
index 63b2b0d120d2..964706109a2a 100644
--- a/velox/functions/prestosql/tests/ArrayDistinctTest.cpp
+++ b/velox/functions/prestosql/tests/ArrayDistinctTest.cpp
@@ -15,7 +15,7 @@
  */
 
 #include <optional>
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 
 using namespace facebook::velox;
 using namespace facebook::velox::test;
diff --git a/velox/functions/prestosql/tests/ArrayDuplicatesTest.cpp b/velox/functions/prestosql/tests/ArrayDuplicatesTest.cpp
index 41c8c6cafa61..3bf1edf7cff9 100644
--- a/velox/functions/prestosql/tests/ArrayDuplicatesTest.cpp
+++ b/velox/functions/prestosql/tests/ArrayDuplicatesTest.cpp
@@ -15,7 +15,7 @@
  */
 
 #include <optional>
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 
 using namespace facebook::velox;
 using namespace facebook::velox::test;
diff --git a/velox/functions/prestosql/tests/ArrayExceptTest.cpp b/velox/functions/prestosql/tests/ArrayExceptTest.cpp
index 256f85d69186..6fb386d531c8 100644
--- a/velox/functions/prestosql/tests/ArrayExceptTest.cpp
+++ b/velox/functions/prestosql/tests/ArrayExceptTest.cpp
@@ -15,7 +15,7 @@
  */
 
 #include <optional>
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 
 using namespace facebook::velox;
 using namespace facebook::velox::test;
diff --git a/velox/functions/prestosql/tests/ArrayFilterTest.cpp b/velox/functions/prestosql/tests/ArrayFilterTest.cpp
index 50c36d52769a..7ebf94818c55 100644
--- a/velox/functions/prestosql/tests/ArrayFilterTest.cpp
+++ b/velox/functions/prestosql/tests/ArrayFilterTest.cpp
@@ -15,7 +15,7 @@
  */
 
 #include "velox/dwio/common/tests/utils/BatchMaker.h"
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 
 using namespace facebook::velox;
 using namespace facebook::velox::test;
diff --git a/velox/functions/prestosql/tests/ArrayIntersectTest.cpp b/velox/functions/prestosql/tests/ArrayIntersectTest.cpp
index 5e6409dd3f3e..48ac84f09442 100644
--- a/velox/functions/prestosql/tests/ArrayIntersectTest.cpp
+++ b/velox/functions/prestosql/tests/ArrayIntersectTest.cpp
@@ -15,7 +15,7 @@
  */
 
 #include <optional>
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 
 using namespace facebook::velox;
 using namespace facebook::velox::test;
diff --git a/velox/functions/prestosql/tests/ArrayJoinTest.cpp b/velox/functions/prestosql/tests/ArrayJoinTest.cpp
index 85269a4d77b4..4e4c2d24498f 100644
--- a/velox/functions/prestosql/tests/ArrayJoinTest.cpp
+++ b/velox/functions/prestosql/tests/ArrayJoinTest.cpp
@@ -15,7 +15,7 @@
  */
 
 #include <optional>
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 
 using namespace facebook::velox;
 using namespace facebook::velox::test;
diff --git a/velox/functions/prestosql/tests/ArrayMaxTest.cpp b/velox/functions/prestosql/tests/ArrayMaxTest.cpp
index 84532b81fdac..9c0c29b7077d 100644
--- a/velox/functions/prestosql/tests/ArrayMaxTest.cpp
+++ b/velox/functions/prestosql/tests/ArrayMaxTest.cpp
@@ -15,7 +15,7 @@
  */
 
 #include <optional>
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 
 using namespace facebook::velox;
 using namespace facebook::velox::test;
diff --git a/velox/functions/prestosql/tests/ArrayMinTest.cpp b/velox/functions/prestosql/tests/ArrayMinTest.cpp
index 83fd376e7b7e..f2a190e6e652 100644
--- a/velox/functions/prestosql/tests/ArrayMinTest.cpp
+++ b/velox/functions/prestosql/tests/ArrayMinTest.cpp
@@ -15,7 +15,7 @@
  */
 
 #include <optional>
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 
 using namespace facebook::velox;
 using namespace facebook::velox::test;
diff --git a/velox/functions/prestosql/tests/ArrayPositionTest.cpp b/velox/functions/prestosql/tests/ArrayPositionTest.cpp
index 9bc450395ded..629dfdafc315 100644
--- a/velox/functions/prestosql/tests/ArrayPositionTest.cpp
+++ b/velox/functions/prestosql/tests/ArrayPositionTest.cpp
@@ -15,7 +15,7 @@
  */
 
 #include <optional>
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 
 using namespace facebook::velox;
 using namespace facebook::velox::test;
diff --git a/velox/functions/prestosql/tests/ArraySortTest.cpp b/velox/functions/prestosql/tests/ArraySortTest.cpp
index 58788fe27e72..b88c73d047e2 100644
--- a/velox/functions/prestosql/tests/ArraySortTest.cpp
+++ b/velox/functions/prestosql/tests/ArraySortTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 #include "velox/common/base/tests/GTestUtils.h"
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 
 #include <fmt/format.h>
 
diff --git a/velox/functions/prestosql/tests/ArraySumTest.cpp b/velox/functions/prestosql/tests/ArraySumTest.cpp
index 4c149b63dae8..fbb04f93233e 100644
--- a/velox/functions/prestosql/tests/ArraySumTest.cpp
+++ b/velox/functions/prestosql/tests/ArraySumTest.cpp
@@ -15,7 +15,7 @@
  */
 
 #include <optional>
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 
 using namespace facebook::velox;
 using namespace facebook::velox::test;
diff --git a/velox/functions/prestosql/tests/ArraysOverlapTest.cpp b/velox/functions/prestosql/tests/ArraysOverlapTest.cpp
index 3924f58f7b55..4fdb4e4e2c20 100644
--- a/velox/functions/prestosql/tests/ArraysOverlapTest.cpp
+++ b/velox/functions/prestosql/tests/ArraysOverlapTest.cpp
@@ -15,7 +15,7 @@
  */
 
 #include <optional>
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 
 using namespace facebook::velox;
 using namespace facebook::velox::test;
diff --git a/velox/functions/prestosql/tests/BitwiseTest.cpp b/velox/functions/prestosql/tests/BitwiseTest.cpp
index e77d67e84141..97d172828142 100644
--- a/velox/functions/prestosql/tests/BitwiseTest.cpp
+++ b/velox/functions/prestosql/tests/BitwiseTest.cpp
@@ -16,7 +16,7 @@
 #include <gmock/gmock.h>
 #include <optional>
 
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 
 namespace facebook::velox {
 
diff --git a/velox/functions/prestosql/tests/CMakeLists.txt b/velox/functions/prestosql/tests/CMakeLists.txt
index 5d507fd3e422..d20945e91bcc 100644
--- a/velox/functions/prestosql/tests/CMakeLists.txt
+++ b/velox/functions/prestosql/tests/CMakeLists.txt
@@ -12,10 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-add_library(velox_functions_test_lib FunctionBaseTest.cpp)
-
-target_link_libraries(velox_functions_test_lib velox_exec velox_exec_test_util
-                      velox_vector_test_lib velox_parse_parser)
+add_subdirectory(utils)
 
 add_executable(
   velox_functions_test
@@ -77,7 +74,7 @@ target_link_libraries(
   velox_expression
   velox_functions_prestosql
   velox_functions_lib
-  velox_exec_test_util
+  velox_exec_test_lib
   velox_dwio_common_test_utils
   gtest
   gtest_main
diff --git a/velox/functions/prestosql/tests/CardinalityTest.cpp b/velox/functions/prestosql/tests/CardinalityTest.cpp
index df5c541f2b22..144d73462f48 100644
--- a/velox/functions/prestosql/tests/CardinalityTest.cpp
+++ b/velox/functions/prestosql/tests/CardinalityTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 
 using namespace facebook::velox;
 using namespace facebook::velox::exec;
diff --git a/velox/functions/prestosql/tests/CastBaseTest.h b/velox/functions/prestosql/tests/CastBaseTest.h
index 550aaffb772d..694170cf8427 100644
--- a/velox/functions/prestosql/tests/CastBaseTest.h
+++ b/velox/functions/prestosql/tests/CastBaseTest.h
@@ -19,7 +19,7 @@
 
 #include "velox/core/Expressions.h"
 #include "velox/core/ITypedExpr.h"
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 #include "velox/vector/tests/TestingDictionaryFunction.h"
 
 namespace facebook::velox::functions::test {
diff --git a/velox/functions/prestosql/tests/CeilFloorTest.cpp b/velox/functions/prestosql/tests/CeilFloorTest.cpp
index dd69aa9a7c41..d96cfd426ed4 100644
--- a/velox/functions/prestosql/tests/CeilFloorTest.cpp
+++ b/velox/functions/prestosql/tests/CeilFloorTest.cpp
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 
 using namespace facebook::velox;
 
diff --git a/velox/functions/prestosql/tests/ComparisonsTest.cpp b/velox/functions/prestosql/tests/ComparisonsTest.cpp
index fdc60fc8c2ec..46ca96046e68 100644
--- a/velox/functions/prestosql/tests/ComparisonsTest.cpp
+++ b/velox/functions/prestosql/tests/ComparisonsTest.cpp
@@ -15,7 +15,7 @@
  */
 #include "velox/common/base/tests/GTestUtils.h"
 #include "velox/functions/Udf.h"
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 
 using namespace facebook::velox;
 
diff --git a/velox/functions/prestosql/tests/DateTimeFunctionsTest.cpp b/velox/functions/prestosql/tests/DateTimeFunctionsTest.cpp
index 2d002f62dc10..8ff14bda473f 100644
--- a/velox/functions/prestosql/tests/DateTimeFunctionsTest.cpp
+++ b/velox/functions/prestosql/tests/DateTimeFunctionsTest.cpp
@@ -17,7 +17,7 @@
 #include <optional>
 #include <string>
 #include <string_view>
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 #include "velox/functions/prestosql/types/TimestampWithTimeZoneType.h"
 #include "velox/type/Date.h"
 #include "velox/type/Timestamp.h"
diff --git a/velox/functions/prestosql/tests/DecimalArithmeticTest.cpp b/velox/functions/prestosql/tests/DecimalArithmeticTest.cpp
index 0fb205af32ef..d80e26ddcfda 100644
--- a/velox/functions/prestosql/tests/DecimalArithmeticTest.cpp
+++ b/velox/functions/prestosql/tests/DecimalArithmeticTest.cpp
@@ -15,7 +15,7 @@
  */
 
 #include "velox/common/base/tests/GTestUtils.h"
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 
 using namespace facebook::velox;
 using namespace facebook::velox::test;
diff --git a/velox/functions/prestosql/tests/ElementAtTest.cpp b/velox/functions/prestosql/tests/ElementAtTest.cpp
index 09f13f8f0d30..bb9342966748 100644
--- a/velox/functions/prestosql/tests/ElementAtTest.cpp
+++ b/velox/functions/prestosql/tests/ElementAtTest.cpp
@@ -16,7 +16,7 @@
 
 #include <optional>
 #include "velox/functions/lib/SubscriptUtil.h"
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 
 using namespace facebook::velox;
 using namespace facebook::velox::functions::test;
diff --git a/velox/functions/prestosql/tests/GreatestLeastTest.cpp b/velox/functions/prestosql/tests/GreatestLeastTest.cpp
index 3b341d3e0c96..5276c479af89 100644
--- a/velox/functions/prestosql/tests/GreatestLeastTest.cpp
+++ b/velox/functions/prestosql/tests/GreatestLeastTest.cpp
@@ -15,7 +15,7 @@
  */
 
 #include <optional>
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 
 using namespace facebook::velox;
 
diff --git a/velox/functions/prestosql/tests/HyperLogLogFunctionsTest.cpp b/velox/functions/prestosql/tests/HyperLogLogFunctionsTest.cpp
index f94ffb5eacb0..f4db674ca563 100644
--- a/velox/functions/prestosql/tests/HyperLogLogFunctionsTest.cpp
+++ b/velox/functions/prestosql/tests/HyperLogLogFunctionsTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 #include "velox/common/hyperloglog/SparseHll.h"
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 #include "velox/functions/prestosql/types/HyperLogLogType.h"
 #define XXH_INLINE_ALL
 #include <xxhash.h>
diff --git a/velox/functions/prestosql/tests/InPredicateTest.cpp b/velox/functions/prestosql/tests/InPredicateTest.cpp
index 60db6964c6d1..ea1d9ce17b8b 100644
--- a/velox/functions/prestosql/tests/InPredicateTest.cpp
+++ b/velox/functions/prestosql/tests/InPredicateTest.cpp
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 
 using namespace facebook::velox;
 using namespace facebook::velox::test;
diff --git a/velox/functions/prestosql/tests/JsonExtractScalarTest.cpp b/velox/functions/prestosql/tests/JsonExtractScalarTest.cpp
index 3be7ccda173f..97a8845dfe95 100644
--- a/velox/functions/prestosql/tests/JsonExtractScalarTest.cpp
+++ b/velox/functions/prestosql/tests/JsonExtractScalarTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 #include "velox/functions/prestosql/types/JsonType.h"
 
 namespace facebook::velox::functions::prestosql {
diff --git a/velox/functions/prestosql/tests/JsonFunctionsTest.cpp b/velox/functions/prestosql/tests/JsonFunctionsTest.cpp
index 5f994086579c..748bdd896bf9 100644
--- a/velox/functions/prestosql/tests/JsonFunctionsTest.cpp
+++ b/velox/functions/prestosql/tests/JsonFunctionsTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 #include "velox/functions/prestosql/types/JsonType.h"
 
 namespace facebook::velox::functions::prestosql {
diff --git a/velox/functions/prestosql/tests/MapConcatTest.cpp b/velox/functions/prestosql/tests/MapConcatTest.cpp
index 97a5deee177b..74a1d5514bc2 100644
--- a/velox/functions/prestosql/tests/MapConcatTest.cpp
+++ b/velox/functions/prestosql/tests/MapConcatTest.cpp
@@ -15,7 +15,7 @@
  */
 #include "velox/expression/VectorFunction.h"
 #include "velox/functions/prestosql/registration/RegistrationFunctions.h"
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 
 using namespace facebook::velox;
 using namespace facebook::velox::functions::test;
diff --git a/velox/functions/prestosql/tests/MapEntriesTest.cpp b/velox/functions/prestosql/tests/MapEntriesTest.cpp
index be4cecf25d5b..fe59999317da 100644
--- a/velox/functions/prestosql/tests/MapEntriesTest.cpp
+++ b/velox/functions/prestosql/tests/MapEntriesTest.cpp
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 
 using namespace facebook::velox;
 using namespace facebook::velox::functions::test;
diff --git a/velox/functions/prestosql/tests/MapFilterTest.cpp b/velox/functions/prestosql/tests/MapFilterTest.cpp
index 3e75f65e6cde..1203a7b88bae 100644
--- a/velox/functions/prestosql/tests/MapFilterTest.cpp
+++ b/velox/functions/prestosql/tests/MapFilterTest.cpp
@@ -16,7 +16,7 @@
 
 #include "velox/dwio/common/tests/utils/BatchMaker.h"
 #include "velox/expression/VarSetter.h"
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 
 using namespace facebook::velox;
 using namespace facebook::velox::test;
diff --git a/velox/functions/prestosql/tests/MapKeysAndValuesTest.cpp b/velox/functions/prestosql/tests/MapKeysAndValuesTest.cpp
index 4bfc338679d6..899b71e89e21 100644
--- a/velox/functions/prestosql/tests/MapKeysAndValuesTest.cpp
+++ b/velox/functions/prestosql/tests/MapKeysAndValuesTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 
 using namespace facebook::velox;
 using namespace facebook::velox::exec;
diff --git a/velox/functions/prestosql/tests/MapTest.cpp b/velox/functions/prestosql/tests/MapTest.cpp
index d47c028fb7cf..9a33623d6ce4 100644
--- a/velox/functions/prestosql/tests/MapTest.cpp
+++ b/velox/functions/prestosql/tests/MapTest.cpp
@@ -16,7 +16,7 @@
 
 #include "velox/common/base/tests/GTestUtils.h"
 #include "velox/functions/prestosql/registration/RegistrationFunctions.h"
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 
 using namespace facebook::velox;
 using namespace facebook::velox::test;
diff --git a/velox/functions/prestosql/tests/NotTest.cpp b/velox/functions/prestosql/tests/NotTest.cpp
index a71753f8ed18..59a515ce50ce 100644
--- a/velox/functions/prestosql/tests/NotTest.cpp
+++ b/velox/functions/prestosql/tests/NotTest.cpp
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 
 using namespace facebook::velox;
 using namespace facebook::velox::test;
diff --git a/velox/functions/prestosql/tests/ReduceTest.cpp b/velox/functions/prestosql/tests/ReduceTest.cpp
index 8cb63ba6c172..6ca9897fede3 100644
--- a/velox/functions/prestosql/tests/ReduceTest.cpp
+++ b/velox/functions/prestosql/tests/ReduceTest.cpp
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 
 using namespace facebook::velox;
 using namespace facebook::velox::test;
diff --git a/velox/functions/prestosql/tests/RegexpReplaceTest.cpp b/velox/functions/prestosql/tests/RegexpReplaceTest.cpp
index c0cb1020c735..c0e992e7b100 100644
--- a/velox/functions/prestosql/tests/RegexpReplaceTest.cpp
+++ b/velox/functions/prestosql/tests/RegexpReplaceTest.cpp
@@ -16,7 +16,7 @@
 #include <exception>
 #include <optional>
 
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 
 namespace facebook::velox {
 namespace {
diff --git a/velox/functions/prestosql/tests/ReverseTest.cpp b/velox/functions/prestosql/tests/ReverseTest.cpp
index 323dc59a7a85..0369f1fa9ef9 100644
--- a/velox/functions/prestosql/tests/ReverseTest.cpp
+++ b/velox/functions/prestosql/tests/ReverseTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 
 using namespace facebook::velox;
 using namespace facebook::velox::test;
diff --git a/velox/functions/prestosql/tests/RoundTest.cpp b/velox/functions/prestosql/tests/RoundTest.cpp
index a1d75cad9768..1abbeff8a229 100644
--- a/velox/functions/prestosql/tests/RoundTest.cpp
+++ b/velox/functions/prestosql/tests/RoundTest.cpp
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 
 using namespace facebook::velox;
 
diff --git a/velox/functions/prestosql/tests/SliceTest.cpp b/velox/functions/prestosql/tests/SliceTest.cpp
index 193cdc5b198d..10b712c038d0 100644
--- a/velox/functions/prestosql/tests/SliceTest.cpp
+++ b/velox/functions/prestosql/tests/SliceTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 
 using namespace facebook::velox;
 using namespace facebook::velox::test;
diff --git a/velox/functions/prestosql/tests/SplitPartTest.cpp b/velox/functions/prestosql/tests/SplitPartTest.cpp
index 1ec532586b3f..dff54e5f848b 100644
--- a/velox/functions/prestosql/tests/SplitPartTest.cpp
+++ b/velox/functions/prestosql/tests/SplitPartTest.cpp
@@ -16,7 +16,7 @@
 #include <gtest/gtest.h>
 #include "velox/expression/Expr.h"
 #include "velox/functions/Udf.h"
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 #include "velox/parse/Expressions.h"
 
 namespace facebook::velox::functions::test {
diff --git a/velox/functions/prestosql/tests/SplitTest.cpp b/velox/functions/prestosql/tests/SplitTest.cpp
index 6aca6dd28078..429d4b217b4b 100644
--- a/velox/functions/prestosql/tests/SplitTest.cpp
+++ b/velox/functions/prestosql/tests/SplitTest.cpp
@@ -16,7 +16,7 @@
 #include <gtest/gtest.h>
 #include "velox/expression/Expr.h"
 #include "velox/functions/Udf.h"
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 #include "velox/parse/Expressions.h"
 
 using namespace facebook::velox;
diff --git a/velox/functions/prestosql/tests/StringFunctionsTest.cpp b/velox/functions/prestosql/tests/StringFunctionsTest.cpp
index 1243770cce48..9fa3bfa38e41 100644
--- a/velox/functions/prestosql/tests/StringFunctionsTest.cpp
+++ b/velox/functions/prestosql/tests/StringFunctionsTest.cpp
@@ -21,7 +21,7 @@
 #include "velox/expression/Expr.h"
 #include "velox/functions/lib/StringEncodingUtils.h"
 #include "velox/functions/lib/string/StringImpl.h"
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 #include "velox/parse/Expressions.h"
 #include "velox/type/Type.h"
 
diff --git a/velox/functions/prestosql/tests/TransformKeysTest.cpp b/velox/functions/prestosql/tests/TransformKeysTest.cpp
index 23eb6f333950..8a4bf40fa965 100644
--- a/velox/functions/prestosql/tests/TransformKeysTest.cpp
+++ b/velox/functions/prestosql/tests/TransformKeysTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 #include "velox/common/base/tests/GTestUtils.h"
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 
 using namespace facebook::velox;
 using namespace facebook::velox::test;
diff --git a/velox/functions/prestosql/tests/TransformTest.cpp b/velox/functions/prestosql/tests/TransformTest.cpp
index 0e13dbf28475..2fd6500ac7c5 100644
--- a/velox/functions/prestosql/tests/TransformTest.cpp
+++ b/velox/functions/prestosql/tests/TransformTest.cpp
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 
 using namespace facebook::velox;
 using namespace facebook::velox::test;
diff --git a/velox/functions/prestosql/tests/TransformValuesTest.cpp b/velox/functions/prestosql/tests/TransformValuesTest.cpp
index ede226797565..5de53cb8ce55 100644
--- a/velox/functions/prestosql/tests/TransformValuesTest.cpp
+++ b/velox/functions/prestosql/tests/TransformValuesTest.cpp
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 
 using namespace facebook::velox;
 using namespace facebook::velox::test;
diff --git a/velox/functions/prestosql/tests/URLFunctionsTest.cpp b/velox/functions/prestosql/tests/URLFunctionsTest.cpp
index 8f8f8dd59db7..31f6dd1a3e1b 100644
--- a/velox/functions/prestosql/tests/URLFunctionsTest.cpp
+++ b/velox/functions/prestosql/tests/URLFunctionsTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 #include <gmock/gmock.h>
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 
 using string_t = std::string;
 
diff --git a/velox/functions/prestosql/tests/WidthBucketArrayTest.cpp b/velox/functions/prestosql/tests/WidthBucketArrayTest.cpp
index fe4bdce3189f..43e9002afab3 100644
--- a/velox/functions/prestosql/tests/WidthBucketArrayTest.cpp
+++ b/velox/functions/prestosql/tests/WidthBucketArrayTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 #include <optional>
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 
 using namespace facebook::velox;
 using namespace facebook::velox::test;
diff --git a/velox/functions/prestosql/tests/ZipTest.cpp b/velox/functions/prestosql/tests/ZipTest.cpp
index b27f31f53021..214cdec4e80e 100644
--- a/velox/functions/prestosql/tests/ZipTest.cpp
+++ b/velox/functions/prestosql/tests/ZipTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 
 using namespace facebook::velox;
 using namespace facebook::velox::test;
diff --git a/velox/functions/prestosql/tests/utils/CMakeLists.txt b/velox/functions/prestosql/tests/utils/CMakeLists.txt
new file mode 100644
index 000000000000..075eecd80201
--- /dev/null
+++ b/velox/functions/prestosql/tests/utils/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+add_library(velox_functions_test_lib FunctionBaseTest.cpp)
+
+target_link_libraries(velox_functions_test_lib velox_exec velox_exec_test_lib
+                      velox_vector_test_lib velox_parse_parser)
diff --git a/velox/functions/prestosql/tests/FunctionBaseTest.cpp b/velox/functions/prestosql/tests/utils/FunctionBaseTest.cpp
similarity index 93%
rename from velox/functions/prestosql/tests/FunctionBaseTest.cpp
rename to velox/functions/prestosql/tests/utils/FunctionBaseTest.cpp
index e9ed702891d3..ed40cd7b86b1 100644
--- a/velox/functions/prestosql/tests/FunctionBaseTest.cpp
+++ b/velox/functions/prestosql/tests/utils/FunctionBaseTest.cpp
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 #include "velox/functions/prestosql/registration/RegistrationFunctions.h"
 #include "velox/parse/TypeResolver.h"
 
diff --git a/velox/functions/prestosql/tests/FunctionBaseTest.h b/velox/functions/prestosql/tests/utils/FunctionBaseTest.h
similarity index 99%
rename from velox/functions/prestosql/tests/FunctionBaseTest.h
rename to velox/functions/prestosql/tests/utils/FunctionBaseTest.h
index 8c3ef256010c..0d41c3188f6c 100644
--- a/velox/functions/prestosql/tests/FunctionBaseTest.h
+++ b/velox/functions/prestosql/tests/utils/FunctionBaseTest.h
@@ -21,7 +21,7 @@
 #include "velox/parse/Expressions.h"
 #include "velox/parse/ExpressionsParser.h"
 #include "velox/type/Type.h"
-#include "velox/vector/tests/VectorTestBase.h"
+#include "velox/vector/tests/utils/VectorTestBase.h"
 
 namespace facebook::velox::functions::test {
 
diff --git a/velox/functions/prestosql/window/tests/CMakeLists.txt b/velox/functions/prestosql/window/tests/CMakeLists.txt
index 7a4721b8e9fb..f7158329e3cd 100644
--- a/velox/functions/prestosql/window/tests/CMakeLists.txt
+++ b/velox/functions/prestosql/window/tests/CMakeLists.txt
@@ -22,7 +22,7 @@ target_link_libraries(
   velox_windows_test
   velox_core
   velox_exec
-  velox_exec_test_util
+  velox_exec_test_lib
   velox_vector_fuzzer
   velox_vector_test_lib
   velox_window
diff --git a/velox/functions/sparksql/CMakeLists.txt b/velox/functions/sparksql/CMakeLists.txt
index df8e724d14c0..a70f145e1cd0 100644
--- a/velox/functions/sparksql/CMakeLists.txt
+++ b/velox/functions/sparksql/CMakeLists.txt
@@ -36,6 +36,9 @@ set_property(TARGET velox_functions_spark PROPERTY JOB_POOL_COMPILE
 
 if(${VELOX_BUILD_TESTING})
   add_subdirectory(tests)
-  add_subdirectory(benchmarks)
   add_subdirectory(aggregates)
 endif()
+
+if(${VELOX_ENABLE_BENCHMARKS})
+  add_subdirectory(benchmarks)
+endif()
diff --git a/velox/functions/sparksql/aggregates/tests/CMakeLists.txt b/velox/functions/sparksql/aggregates/tests/CMakeLists.txt
index 633199271261..1f7c68bdb48f 100644
--- a/velox/functions/sparksql/aggregates/tests/CMakeLists.txt
+++ b/velox/functions/sparksql/aggregates/tests/CMakeLists.txt
@@ -20,7 +20,7 @@ add_test(velox_functions_spark_aggregates_test
 
 target_link_libraries(
   velox_functions_spark_aggregates_test
-  velox_exec_test_util
+  velox_exec_test_lib
   velox_vector_test_lib
   velox_aggregates_test_lib
   velox_functions_spark_aggregates
diff --git a/velox/functions/sparksql/benchmarks/CMakeLists.txt b/velox/functions/sparksql/benchmarks/CMakeLists.txt
index be14ec151ab5..f72de50ebe42 100644
--- a/velox/functions/sparksql/benchmarks/CMakeLists.txt
+++ b/velox/functions/sparksql/benchmarks/CMakeLists.txt
@@ -18,7 +18,7 @@ target_link_libraries(
   velox_functions_prestosql
   velox_functions_spark
   velox_expression
-  velox_exec_test_util
+  velox_exec_test_lib
   velox_vector_test_lib
   velox_vector_fuzzer
   ${FOLLY_WITH_DEPENDENCIES}
diff --git a/velox/functions/sparksql/tests/ArraySortTest.cpp b/velox/functions/sparksql/tests/ArraySortTest.cpp
index 44ed37c7bf6b..5be719dcf782 100644
--- a/velox/functions/sparksql/tests/ArraySortTest.cpp
+++ b/velox/functions/sparksql/tests/ArraySortTest.cpp
@@ -16,7 +16,7 @@
 
 #include <optional>
 
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 #include "velox/functions/sparksql/tests/ArraySortTestData.h"
 #include "velox/functions/sparksql/tests/SparkFunctionBaseTest.h"
 #include "velox/vector/ComplexVector.h"
diff --git a/velox/functions/sparksql/tests/CMakeLists.txt b/velox/functions/sparksql/tests/CMakeLists.txt
index 35590e498244..4fce5e761fcc 100644
--- a/velox/functions/sparksql/tests/CMakeLists.txt
+++ b/velox/functions/sparksql/tests/CMakeLists.txt
@@ -34,7 +34,7 @@ target_link_libraries(
   velox_functions_spark_test
   velox_functions_spark
   velox_functions_test_lib
-  velox_exec_test_util
+  velox_exec_test_lib
   ${FMT}
   gtest
   gtest_main
diff --git a/velox/functions/sparksql/tests/MapTest.cpp b/velox/functions/sparksql/tests/MapTest.cpp
index eb3560ebedf5..8e3540f4b8b5 100644
--- a/velox/functions/sparksql/tests/MapTest.cpp
+++ b/velox/functions/sparksql/tests/MapTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 #include "velox/functions/sparksql/tests/SparkFunctionBaseTest.h"
 
 #include <stdint.h>
diff --git a/velox/functions/sparksql/tests/SortArrayTest.cpp b/velox/functions/sparksql/tests/SortArrayTest.cpp
index c3be4a532aa3..440e581a0052 100644
--- a/velox/functions/sparksql/tests/SortArrayTest.cpp
+++ b/velox/functions/sparksql/tests/SortArrayTest.cpp
@@ -18,7 +18,7 @@
 #include <limits>
 #include <optional>
 
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 #include "velox/functions/sparksql/Register.h"
 #include "velox/functions/sparksql/tests/ArraySortTestData.h"
 #include "velox/functions/sparksql/tests/SparkFunctionBaseTest.h"
diff --git a/velox/functions/sparksql/tests/SparkFunctionBaseTest.h b/velox/functions/sparksql/tests/SparkFunctionBaseTest.h
index 2123738808ec..f56659fdab83 100644
--- a/velox/functions/sparksql/tests/SparkFunctionBaseTest.h
+++ b/velox/functions/sparksql/tests/SparkFunctionBaseTest.h
@@ -15,7 +15,7 @@
  */
 #pragma once
 
-#include "velox/functions/prestosql/tests/FunctionBaseTest.h"
+#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
 #include "velox/functions/sparksql/Register.h"
 #include "velox/parse/TypeResolver.h"
 
diff --git a/velox/row/benchmark/DynamicRowVectorDeserializeBenchmark.cpp b/velox/row/benchmark/DynamicRowVectorDeserializeBenchmark.cpp
index 9fcc0614269e..621c37c90472 100644
--- a/velox/row/benchmark/DynamicRowVectorDeserializeBenchmark.cpp
+++ b/velox/row/benchmark/DynamicRowVectorDeserializeBenchmark.cpp
@@ -23,7 +23,7 @@
 #include "velox/row/UnsafeRowDynamicSerializer.h"
 #include "velox/type/Type.h"
 #include "velox/vector/fuzzer/VectorFuzzer.h"
-#include "velox/vector/tests/VectorMaker.h"
+#include "velox/vector/tests/utils/VectorMaker.h"
 
 namespace facebook::spark::benchmarks {
 namespace {
diff --git a/velox/row/tests/CMakeLists.txt b/velox/row/tests/CMakeLists.txt
index 5fb073948576..41547fc6cdb6 100644
--- a/velox/row/tests/CMakeLists.txt
+++ b/velox/row/tests/CMakeLists.txt
@@ -22,7 +22,7 @@ target_link_libraries(
   velox_row_test
   velox_row
   velox_exec
-  velox_exec_test_util
+  velox_exec_test_lib
   velox_functions_lib
   velox_functions_prestosql
   velox_presto_serializer
diff --git a/velox/row/tests/UnsafeRowBatchDeserializerTest.cpp b/velox/row/tests/UnsafeRowBatchDeserializerTest.cpp
index b40d2b76d8d5..7713b82195dd 100644
--- a/velox/row/tests/UnsafeRowBatchDeserializerTest.cpp
+++ b/velox/row/tests/UnsafeRowBatchDeserializerTest.cpp
@@ -23,7 +23,7 @@
 #include "velox/row/UnsafeRowParser.h"
 #include "velox/vector/BaseVector.h"
 #include "velox/vector/TypeAliases.h"
-#include "velox/vector/tests/VectorTestBase.h"
+#include "velox/vector/tests/utils/VectorTestBase.h"
 
 namespace facebook::velox::row {
 namespace {
diff --git a/velox/row/tests/UnsafeRowDeserializerTest.cpp b/velox/row/tests/UnsafeRowDeserializerTest.cpp
index 04225cc7b699..3ef7ccc16ec2 100644
--- a/velox/row/tests/UnsafeRowDeserializerTest.cpp
+++ b/velox/row/tests/UnsafeRowDeserializerTest.cpp
@@ -22,7 +22,7 @@
 #include "velox/row/UnsafeRowDynamicSerializer.h"
 #include "velox/row/UnsafeRowParser.h"
 #include "velox/vector/fuzzer/VectorFuzzer.h"
-#include "velox/vector/tests/VectorTestBase.h"
+#include "velox/vector/tests/utils/VectorTestBase.h"
 
 #include "velox/vector/BaseVector.h"
 #include "velox/vector/TypeAliases.h"
diff --git a/velox/row/tests/UnsafeRowFuzzTests.cpp b/velox/row/tests/UnsafeRowFuzzTests.cpp
index 66ba56c07b1c..41120bbd6c2b 100644
--- a/velox/row/tests/UnsafeRowFuzzTests.cpp
+++ b/velox/row/tests/UnsafeRowFuzzTests.cpp
@@ -25,7 +25,7 @@
 #include "velox/vector/BaseVector.h"
 #include "velox/vector/ComplexVector.h"
 #include "velox/vector/fuzzer/VectorFuzzer.h"
-#include "velox/vector/tests/VectorTestBase.h"
+#include "velox/vector/tests/utils/VectorTestBase.h"
 
 namespace facebook::velox::row {
 namespace {
diff --git a/velox/row/tests/UnsafeRowSerializerTest.cpp b/velox/row/tests/UnsafeRowSerializerTest.cpp
index d2fc6c72a2eb..85ec393a0af6 100644
--- a/velox/row/tests/UnsafeRowSerializerTest.cpp
+++ b/velox/row/tests/UnsafeRowSerializerTest.cpp
@@ -22,7 +22,7 @@
 #include "velox/row/UnsafeRowSerializer.h"
 #include "velox/type/Type.h"
 #include "velox/vector/BaseVector.h"
-#include "velox/vector/tests/VectorMaker.h"
+#include "velox/vector/tests/utils/VectorMaker.h"
 
 namespace facebook::velox::row {
 using namespace facebook::velox;
diff --git a/velox/serializers/tests/PrestoSerializerTest.cpp b/velox/serializers/tests/PrestoSerializerTest.cpp
index b73ba583a352..ddec328f7977 100644
--- a/velox/serializers/tests/PrestoSerializerTest.cpp
+++ b/velox/serializers/tests/PrestoSerializerTest.cpp
@@ -21,7 +21,7 @@
 #include "velox/functions/prestosql/types/TimestampWithTimeZoneType.h"
 #include "velox/vector/BaseVector.h"
 #include "velox/vector/ComplexVector.h"
-#include "velox/vector/tests/VectorTestBase.h"
+#include "velox/vector/tests/utils/VectorTestBase.h"
 
 using namespace facebook::velox;
 using namespace facebook::velox::test;
diff --git a/velox/serializers/tests/UnsafeRowSerializerTest.cpp b/velox/serializers/tests/UnsafeRowSerializerTest.cpp
index ff3686045e44..53cb4fcdedf1 100644
--- a/velox/serializers/tests/UnsafeRowSerializerTest.cpp
+++ b/velox/serializers/tests/UnsafeRowSerializerTest.cpp
@@ -16,7 +16,7 @@
 #include "velox/serializers/UnsafeRowSerializer.h"
 #include <gtest/gtest.h>
 #include "velox/vector/fuzzer/VectorFuzzer.h"
-#include "velox/vector/tests/VectorTestBase.h"
+#include "velox/vector/tests/utils/VectorTestBase.h"
 
 using namespace facebook::velox;
 
diff --git a/velox/substrait/tests/CMakeLists.txt b/velox/substrait/tests/CMakeLists.txt
index c6bef8a42769..d14925e012a1 100644
--- a/velox/substrait/tests/CMakeLists.txt
+++ b/velox/substrait/tests/CMakeLists.txt
@@ -38,7 +38,7 @@ target_link_libraries(
   velox_hive_connector
   velox_type
   velox_serialization
-  velox_exec_test_util
+  velox_exec_test_lib
   velox_functions_json
   velox_vector
   velox_memory
diff --git a/velox/substrait/tests/Substrait2VeloxValuesNodeConversionTest.cpp b/velox/substrait/tests/Substrait2VeloxValuesNodeConversionTest.cpp
index 74a0d4867938..d1c10ec3455b 100644
--- a/velox/substrait/tests/Substrait2VeloxValuesNodeConversionTest.cpp
+++ b/velox/substrait/tests/Substrait2VeloxValuesNodeConversionTest.cpp
@@ -20,7 +20,7 @@
 #include "velox/dwio/common/tests/utils/DataFiles.h"
 #include "velox/exec/tests/utils/OperatorTestBase.h"
 #include "velox/exec/tests/utils/PlanBuilder.h"
-#include "velox/vector/tests/VectorTestBase.h"
+#include "velox/vector/tests/utils/VectorTestBase.h"
 
 #include "velox/substrait/SubstraitToVeloxPlan.h"
 
diff --git a/velox/substrait/tests/VeloxSubstraitRoundTripPlanConverterTest.cpp b/velox/substrait/tests/VeloxSubstraitRoundTripPlanConverterTest.cpp
index 51d1151d0a07..70802a1fabc5 100644
--- a/velox/substrait/tests/VeloxSubstraitRoundTripPlanConverterTest.cpp
+++ b/velox/substrait/tests/VeloxSubstraitRoundTripPlanConverterTest.cpp
@@ -18,7 +18,7 @@
 
 #include "velox/exec/tests/utils/OperatorTestBase.h"
 #include "velox/exec/tests/utils/PlanBuilder.h"
-#include "velox/vector/tests/VectorMaker.h"
+#include "velox/vector/tests/utils/VectorMaker.h"
 
 #include "velox/substrait/SubstraitToVeloxPlan.h"
 #include "velox/substrait/VeloxToSubstraitPlan.h"
diff --git a/velox/vector/CMakeLists.txt b/velox/vector/CMakeLists.txt
index f3e74097df14..95856ed10296 100644
--- a/velox/vector/CMakeLists.txt
+++ b/velox/vector/CMakeLists.txt
@@ -31,7 +31,12 @@ target_link_libraries(velox_vector velox_encode velox_memory velox_time
 add_subdirectory(arrow)
 add_subdirectory(fuzzer)
 
-if(${VELOX_BUILD_TESTING} OR ${VELOX_ENABLE_BENCHMARKS_BASIC})
+if(${VELOX_BUILD_TESTING})
   add_subdirectory(tests)
+elseif(${VELOX_BUILD_TEST_UTILS})
+  add_subdirectory(tests/utils)
+endif()
+
+if(${VELOX_ENABLE_BENCHMARKS})
   add_subdirectory(benchmarks)
 endif()
diff --git a/velox/vector/arrow/tests/ArrowBridgeArrayTest.cpp b/velox/vector/arrow/tests/ArrowBridgeArrayTest.cpp
index ff3e366b54c7..c219210570a1 100644
--- a/velox/vector/arrow/tests/ArrowBridgeArrayTest.cpp
+++ b/velox/vector/arrow/tests/ArrowBridgeArrayTest.cpp
@@ -23,7 +23,7 @@
 #include "velox/common/base/Nulls.h"
 #include "velox/core/QueryCtx.h"
 #include "velox/vector/arrow/Bridge.h"
-#include "velox/vector/tests/VectorMaker.h"
+#include "velox/vector/tests/utils/VectorMaker.h"
 
 namespace {
 
diff --git a/velox/vector/benchmarks/CopyBenchmark.cpp b/velox/vector/benchmarks/CopyBenchmark.cpp
index 2c824afabbc2..b3d28bd97997 100644
--- a/velox/vector/benchmarks/CopyBenchmark.cpp
+++ b/velox/vector/benchmarks/CopyBenchmark.cpp
@@ -17,7 +17,7 @@
 #include <folly/Benchmark.h>
 #include <folly/init/Init.h>
 
-#include "velox/vector/tests/VectorMaker.h"
+#include "velox/vector/tests/utils/VectorMaker.h"
 
 namespace facebook::velox {
 namespace {
diff --git a/velox/vector/benchmarks/SimpleVectorHashAllBenchmark.cpp b/velox/vector/benchmarks/SimpleVectorHashAllBenchmark.cpp
index 26eb68f7e9b2..0e639b729941 100644
--- a/velox/vector/benchmarks/SimpleVectorHashAllBenchmark.cpp
+++ b/velox/vector/benchmarks/SimpleVectorHashAllBenchmark.cpp
@@ -18,8 +18,8 @@
 #include <folly/init/Init.h>
 
 #include "velox/vector/SimpleVector.h"
-#include "velox/vector/tests/VectorMaker.h"
 #include "velox/vector/tests/VectorTestUtils.h"
+#include "velox/vector/tests/utils/VectorMaker.h"
 
 namespace facebook::velox::test {
 namespace {
diff --git a/velox/vector/tests/BiasVectorTest.cpp b/velox/vector/tests/BiasVectorTest.cpp
index d1ef95d56e66..2426144dee15 100644
--- a/velox/vector/tests/BiasVectorTest.cpp
+++ b/velox/vector/tests/BiasVectorTest.cpp
@@ -18,7 +18,7 @@
 
 #include "velox/common/base/tests/GTestUtils.h"
 #include "velox/vector/SimpleVector.h"
-#include "velox/vector/tests/VectorMaker.h"
+#include "velox/vector/tests/utils/VectorMaker.h"
 
 namespace facebook::velox::test {
 
diff --git a/velox/vector/tests/CMakeLists.txt b/velox/vector/tests/CMakeLists.txt
index 5761d514a4d9..3616c6dafd7b 100644
--- a/velox/vector/tests/CMakeLists.txt
+++ b/velox/vector/tests/CMakeLists.txt
@@ -11,9 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-add_library(velox_vector_test_lib VectorMaker.cpp VectorTestBase.cpp)
-
-target_link_libraries(velox_vector_test_lib velox_vector)
+add_subdirectory(utils)
 
 add_executable(
   velox_vector_test
diff --git a/velox/vector/tests/DecodedVectorTest.cpp b/velox/vector/tests/DecodedVectorTest.cpp
index 79342bbf821c..fcf7330bd30a 100644
--- a/velox/vector/tests/DecodedVectorTest.cpp
+++ b/velox/vector/tests/DecodedVectorTest.cpp
@@ -25,8 +25,8 @@
 #include "velox/vector/BaseVector.h"
 #include "velox/vector/SelectivityVector.h"
 #include "velox/vector/TypeAliases.h"
-#include "velox/vector/tests/VectorTestBase.h"
 #include "velox/vector/tests/VectorTestUtils.h"
+#include "velox/vector/tests/utils/VectorTestBase.h"
 
 namespace facebook::velox::test {
 
diff --git a/velox/vector/tests/EnsureWritableVectorTest.cpp b/velox/vector/tests/EnsureWritableVectorTest.cpp
index 2a90540b83a9..54f6231d0f59 100644
--- a/velox/vector/tests/EnsureWritableVectorTest.cpp
+++ b/velox/vector/tests/EnsureWritableVectorTest.cpp
@@ -15,7 +15,7 @@
  */
 #include <gtest/gtest.h>
 #include "velox/vector/ComplexVector.h"
-#include "velox/vector/tests/VectorMaker.h"
+#include "velox/vector/tests/utils/VectorMaker.h"
 
 using namespace facebook::velox;
 
diff --git a/velox/vector/tests/IsWritableVectorTest.cpp b/velox/vector/tests/IsWritableVectorTest.cpp
index fe2a28fb457c..f86955bf09c9 100644
--- a/velox/vector/tests/IsWritableVectorTest.cpp
+++ b/velox/vector/tests/IsWritableVectorTest.cpp
@@ -17,7 +17,7 @@
 #include <gtest/gtest.h>
 #include <velox/buffer/Buffer.h>
 #include "velox/vector/ComplexVector.h"
-#include "velox/vector/tests/VectorMaker.h"
+#include "velox/vector/tests/utils//VectorMaker.h"
 
 using namespace facebook::velox;
 using namespace facebook::velox::test;
diff --git a/velox/vector/tests/LazyVectorTest.cpp b/velox/vector/tests/LazyVectorTest.cpp
index 950d6e1eb918..5b9f0f16e1b4 100644
--- a/velox/vector/tests/LazyVectorTest.cpp
+++ b/velox/vector/tests/LazyVectorTest.cpp
@@ -16,7 +16,7 @@
 
 #include <gtest/gtest.h>
 
-#include "velox/vector/tests/VectorTestBase.h"
+#include "velox/vector/tests/utils/VectorTestBase.h"
 
 using namespace facebook::velox;
 using namespace facebook::velox::test;
diff --git a/velox/vector/tests/MayHaveNullsRecursiveTest.cpp b/velox/vector/tests/MayHaveNullsRecursiveTest.cpp
index 57abc02465e5..c3399378c6d3 100644
--- a/velox/vector/tests/MayHaveNullsRecursiveTest.cpp
+++ b/velox/vector/tests/MayHaveNullsRecursiveTest.cpp
@@ -16,7 +16,7 @@
 
 #include <gtest/gtest.h>
 
-#include "velox/vector/tests/VectorMaker.h"
+#include "velox/vector/tests/utils/VectorMaker.h"
 
 namespace facebook::velox::test {
 
diff --git a/velox/vector/tests/SimpleVectorTestHelper.h b/velox/vector/tests/SimpleVectorTestHelper.h
index 4a0ec1040af9..a78a88e87b18 100644
--- a/velox/vector/tests/SimpleVectorTestHelper.h
+++ b/velox/vector/tests/SimpleVectorTestHelper.h
@@ -20,8 +20,8 @@
 #include <string>
 
 #include "velox/vector/SimpleVector.h"
-#include "velox/vector/tests/VectorMaker.h"
 #include "velox/vector/tests/VectorTestUtils.h"
+#include "velox/vector/tests/utils/VectorMaker.h"
 
 namespace facebook::velox::test {
 
diff --git a/velox/vector/tests/TestingDictionaryFunction.h b/velox/vector/tests/TestingDictionaryFunction.h
index 53919263b6ec..e37c366bf323 100644
--- a/velox/vector/tests/TestingDictionaryFunction.h
+++ b/velox/vector/tests/TestingDictionaryFunction.h
@@ -16,7 +16,7 @@
 #pragma once
 
 #include "velox/expression/VectorFunction.h"
-#include "velox/vector/tests/VectorTestBase.h"
+#include "velox/vector/tests/utils/VectorTestBase.h"
 
 namespace facebook::velox::test {
 
diff --git a/velox/vector/tests/VectorCompareTest.cpp b/velox/vector/tests/VectorCompareTest.cpp
index 5e8016f6fb73..50599290a76b 100644
--- a/velox/vector/tests/VectorCompareTest.cpp
+++ b/velox/vector/tests/VectorCompareTest.cpp
@@ -18,7 +18,7 @@
 #include <gtest/gtest.h>
 #include <optional>
 
-#include "velox/vector/tests/VectorTestBase.h"
+#include "velox/vector/tests/utils/VectorTestBase.h"
 
 namespace facebook::velox {
 class VectorCompareTest : public testing::Test,
diff --git a/velox/vector/tests/VectorEstimateFlatSizeTest.cpp b/velox/vector/tests/VectorEstimateFlatSizeTest.cpp
index 4f84f73fa4ba..7489b98a5c29 100644
--- a/velox/vector/tests/VectorEstimateFlatSizeTest.cpp
+++ b/velox/vector/tests/VectorEstimateFlatSizeTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 #include <gtest/gtest.h>
-#include "velox/vector/tests/VectorTestBase.h"
+#include "velox/vector/tests/utils/VectorTestBase.h"
 
 using namespace facebook::velox;
 
diff --git a/velox/vector/tests/VectorMakerTest.cpp b/velox/vector/tests/VectorMakerTest.cpp
index f26d65254bbf..814b296a65fc 100644
--- a/velox/vector/tests/VectorMakerTest.cpp
+++ b/velox/vector/tests/VectorMakerTest.cpp
@@ -18,7 +18,7 @@
 
 #include "velox/common/base/VeloxException.h"
 #include "velox/common/memory/Memory.h"
-#include "velox/vector/tests/VectorMaker.h"
+#include "velox/vector/tests/utils/VectorMaker.h"
 
 using namespace facebook::velox;
 using facebook::velox::test::VectorMaker;
diff --git a/velox/vector/tests/VectorPoolTest.cpp b/velox/vector/tests/VectorPoolTest.cpp
index 43e2453762e3..f19d3bd6493a 100644
--- a/velox/vector/tests/VectorPoolTest.cpp
+++ b/velox/vector/tests/VectorPoolTest.cpp
@@ -15,7 +15,7 @@
  */
 #include "velox/vector/VectorPool.h"
 #include <gtest/gtest.h>
-#include "velox/vector/tests/VectorTestBase.h"
+#include "velox/vector/tests/utils/VectorTestBase.h"
 
 namespace facebook::velox::test {
 
diff --git a/velox/vector/tests/VectorPrepareForReuseTest.cpp b/velox/vector/tests/VectorPrepareForReuseTest.cpp
index b4191bae8e87..843da68ba987 100644
--- a/velox/vector/tests/VectorPrepareForReuseTest.cpp
+++ b/velox/vector/tests/VectorPrepareForReuseTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 #include <gtest/gtest.h>
-#include "velox/vector/tests/VectorTestBase.h"
+#include "velox/vector/tests/utils/VectorTestBase.h"
 
 using namespace facebook::velox;
 
diff --git a/velox/vector/tests/VectorTest.cpp b/velox/vector/tests/VectorTest.cpp
index 8796c4cec637..a067604f27ad 100644
--- a/velox/vector/tests/VectorTest.cpp
+++ b/velox/vector/tests/VectorTest.cpp
@@ -27,8 +27,8 @@
 #include "velox/vector/SimpleVector.h"
 #include "velox/vector/TypeAliases.h"
 #include "velox/vector/VectorTypeUtils.h"
-#include "velox/vector/tests/VectorMaker.h"
-#include "velox/vector/tests/VectorTestBase.h"
+#include "velox/vector/tests/utils/VectorMaker.h"
+#include "velox/vector/tests/utils/VectorTestBase.h"
 
 using namespace facebook::velox;
 using facebook::velox::ComplexType;
diff --git a/velox/vector/tests/VectorTestUtils.h b/velox/vector/tests/VectorTestUtils.h
index 6d9d48ca6593..7c6f9536027a 100644
--- a/velox/vector/tests/VectorTestUtils.h
+++ b/velox/vector/tests/VectorTestUtils.h
@@ -16,9 +16,9 @@
 
 #pragma once
 
-#include "velox/vector/tests/VectorMaker.h"
 #include "velox/vector/tests/VectorMakerStats.h"
 #include "velox/vector/tests/VectorValueGenerator.h"
+#include "velox/vector/tests/utils/VectorMaker.h"
 
 namespace facebook::velox::test {
 
diff --git a/velox/vector/tests/VectorToStringTest.cpp b/velox/vector/tests/VectorToStringTest.cpp
index c58589f649ae..d36b93b5b081 100644
--- a/velox/vector/tests/VectorToStringTest.cpp
+++ b/velox/vector/tests/VectorToStringTest.cpp
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "velox/vector/tests/VectorTestBase.h"
+#include "velox/vector/tests/utils/VectorTestBase.h"
 
 namespace facebook::velox::test {
 
diff --git a/velox/vector/tests/utils/CMakeLists.txt b/velox/vector/tests/utils/CMakeLists.txt
new file mode 100644
index 000000000000..9421f6136362
--- /dev/null
+++ b/velox/vector/tests/utils/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+add_library(velox_vector_test_lib VectorMaker.cpp VectorTestBase.cpp)
+
+target_link_libraries(velox_vector_test_lib velox_vector)
diff --git a/velox/vector/tests/VectorMaker-inl.h b/velox/vector/tests/utils/VectorMaker-inl.h
similarity index 100%
rename from velox/vector/tests/VectorMaker-inl.h
rename to velox/vector/tests/utils/VectorMaker-inl.h
diff --git a/velox/vector/tests/VectorMaker.cpp b/velox/vector/tests/utils/VectorMaker.cpp
similarity index 99%
rename from velox/vector/tests/VectorMaker.cpp
rename to velox/vector/tests/utils/VectorMaker.cpp
index 98214078aa34..fb65adf8dc74 100644
--- a/velox/vector/tests/VectorMaker.cpp
+++ b/velox/vector/tests/utils/VectorMaker.cpp
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "velox/vector/tests/VectorMaker.h"
+#include "velox/vector/tests/utils/VectorMaker.h"
 
 namespace facebook::velox::test {
 
diff --git a/velox/vector/tests/VectorMaker.h b/velox/vector/tests/utils/VectorMaker.h
similarity index 99%
rename from velox/vector/tests/VectorMaker.h
rename to velox/vector/tests/utils/VectorMaker.h
index 18132502217b..39a0f4815bc5 100644
--- a/velox/vector/tests/VectorMaker.h
+++ b/velox/vector/tests/utils/VectorMaker.h
@@ -720,4 +720,4 @@ class VectorMaker {
 
 } // namespace facebook::velox::test
 
-#include "velox/vector/tests/VectorMaker-inl.h"
+#include "velox/vector/tests/utils/VectorMaker-inl.h"
diff --git a/velox/vector/tests/VectorTestBase.cpp b/velox/vector/tests/utils/VectorTestBase.cpp
similarity index 98%
rename from velox/vector/tests/VectorTestBase.cpp
rename to velox/vector/tests/utils/VectorTestBase.cpp
index 8736e4abacb1..cf138b736201 100644
--- a/velox/vector/tests/VectorTestBase.cpp
+++ b/velox/vector/tests/utils/VectorTestBase.cpp
@@ -13,8 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-#include "velox/vector/tests/VectorTestBase.h"
+#include "velox/vector/tests/utils/VectorTestBase.h"
 
 namespace facebook::velox::test {
 
diff --git a/velox/vector/tests/VectorTestBase.h b/velox/vector/tests/utils/VectorTestBase.h
similarity index 99%
rename from velox/vector/tests/VectorTestBase.h
rename to velox/vector/tests/utils/VectorTestBase.h
index e6be308f7a1d..440abe486f10 100644
--- a/velox/vector/tests/VectorTestBase.h
+++ b/velox/vector/tests/utils/VectorTestBase.h
@@ -16,7 +16,7 @@
 #pragma once
 
 #include "velox/vector/FlatVector.h"
-#include "velox/vector/tests/VectorMaker.h"
+#include "velox/vector/tests/utils/VectorMaker.h"
 
 #include <gtest/gtest.h>