diff --git a/velox/exec/CMakeLists.txt b/velox/exec/CMakeLists.txt
index 5ba6fb4f84bb..9972f46b3ecb 100644
--- a/velox/exec/CMakeLists.txt
+++ b/velox/exec/CMakeLists.txt
@@ -106,8 +106,7 @@ velox_link_libraries(
   velox_common_base
   velox_test_util
   velox_arrow_bridge
-  velox_common_compression
-  velox_query_trace_exec)
+  velox_common_compression)
 
 if(${VELOX_BUILD_TESTING})
   add_subdirectory(fuzzer)
@@ -121,4 +120,3 @@ if(${VELOX_ENABLE_BENCHMARKS})
 endif()
 
 add_subdirectory(prefixsort)
-add_subdirectory(trace)
diff --git a/velox/exec/tests/QueryTraceTest.cpp b/velox/exec/tests/QueryTraceTest.cpp
index 13a9336de599..ccecdf38f542 100644
--- a/velox/exec/tests/QueryTraceTest.cpp
+++ b/velox/exec/tests/QueryTraceTest.cpp
@@ -278,8 +278,16 @@ TEST_F(QueryTracerTest, task) {
   const auto expectedResult =
       AssertQueryBuilder(planNode).maxDrivers(1).copyResults(pool());
 
-  for (const auto* taceTaskRegExp :
-       {".*", "test_cursor [12345]", "xxx_yyy \\d+"}) {
+  struct {
+    std::string taskRegExpr;
+    uint8_t expectedNumDirs;
+
+    std::string debugString() const {
+      return fmt::format(
+          "taskRegExpr: {}, expectedNumDirs: ", taskRegExpr, expectedNumDirs);
+    }
+  } testSettings[]{{".*", 1}, {"test_cursor .*", 1}, {"xxx_yyy \\d+", 0}};
+  for (const auto& testData : testSettings) {
     const auto outputDir = TempDirectoryPath::create();
     const auto expectedQueryConfigs =
         std::unordered_map<std::string, std::string>{
@@ -287,7 +295,7 @@ TEST_F(QueryTracerTest, task) {
             {core::QueryConfig::kSpillNumPartitionBits, "17"},
             {core::QueryConfig::kQueryTraceEnabled, "true"},
             {core::QueryConfig::kQueryTraceDir, outputDir->getPath()},
-            {core::QueryConfig::kQueryTraceTaskRegExp, taceTaskRegExp},
+            {core::QueryConfig::kQueryTraceTaskRegExp, testData.taskRegExpr},
             {core::QueryConfig::kQueryTraceNodeIds, "1,2"},
             {"key1", "value1"},
         };
@@ -315,14 +323,14 @@ TEST_F(QueryTracerTest, task) {
     const auto fs = filesystems::getFileSystem(expectedDir, nullptr);
     const auto actaulDirs = fs->list(outputDir->getPath());
 
-    if (std::strcmp(taceTaskRegExp, "xxx_yyy \\d+") == 0) {
-      ASSERT_EQ(actaulDirs.size(), 0);
+    if (testData.taskRegExpr == "xxx_yyy \\d+") {
+      ASSERT_EQ(actaulDirs.size(), testData.expectedNumDirs);
       continue;
     }
-    ASSERT_EQ(actaulDirs.size(), 1);
+    ASSERT_EQ(actaulDirs.size(), testData.expectedNumDirs);
     ASSERT_EQ(actaulDirs.at(0), expectedDir);
     const auto taskIds = getTaskIds(outputDir->getPath(), fs);
-    ASSERT_EQ(taskIds.size(), 1);
+    ASSERT_EQ(taskIds.size(), testData.expectedNumDirs);
     ASSERT_EQ(taskIds.at(0), task->taskId());
 
     std::unordered_map<std::string, std::string> acutalQueryConfigs;
diff --git a/velox/tool/trace/CMakeLists.txt b/velox/tool/trace/CMakeLists.txt
index aad2d45bc9b8..77213f22ca1e 100644
--- a/velox/tool/trace/CMakeLists.txt
+++ b/velox/tool/trace/CMakeLists.txt
@@ -16,7 +16,6 @@ velox_add_library(velox_query_trace_replayer_base OperatorReplayerBase.cpp
                   TableWriterReplayer.cpp)
 velox_link_libraries(
   velox_query_trace_replayer_base
-  velox_query_trace_retrieve
   velox_aggregates
   velox_type
   velox_vector
@@ -38,4 +37,4 @@ target_link_libraries(
   velox_exec_test_lib
   velox_tpch_connector)
 
-add_subdirectory(test)
+add_subdirectory(tests)
diff --git a/velox/tool/trace/tests/CMakeLists.txt b/velox/tool/trace/tests/CMakeLists.txt
index c0b76aa64892..fa07996fdd68 100644
--- a/velox/tool/trace/tests/CMakeLists.txt
+++ b/velox/tool/trace/tests/CMakeLists.txt
@@ -26,8 +26,6 @@ target_link_libraries(
   velox_exec
   velox_exec_test_lib
   velox_memory
-  velox_query_trace_exec
-  velox_query_trace_retrieve
   velox_query_trace_replayer_base
   velox_vector_fuzzer
   GTest::gtest_main
diff --git a/velox/tool/trace/tests/TableWriterReplayerTest.cpp b/velox/tool/trace/tests/TableWriterReplayerTest.cpp
index 0ca0a1286c50..7bda92ec6213 100644
--- a/velox/tool/trace/tests/TableWriterReplayerTest.cpp
+++ b/velox/tool/trace/tests/TableWriterReplayerTest.cpp
@@ -409,3 +409,11 @@ TEST_F(TableWriterReplayerTest, partitionWrite) {
 }
 
 } // namespace facebook::velox::tool::trace::test
+
+int main(int argc, char** argv) {
+  testing::InitGoogleTest(&argc, argv);
+  // Signal handler required for ThreadDebugInfoTest
+  facebook::velox::process::addDefaultFatalSignalHandler();
+  folly::Init init(&argc, &argv, false);
+  return RUN_ALL_TESTS();
+}