diff --git a/test/blockchaintest/blockchaintest.cpp b/test/blockchaintest/blockchaintest.cpp
index bf795491e9..8026c70ba8 100644
--- a/test/blockchaintest/blockchaintest.cpp
+++ b/test/blockchaintest/blockchaintest.cpp
@@ -6,8 +6,8 @@
 #include <evmone/evmone.h>
 #include <evmone/version.h>
 #include <test/utils/blockchaintest.hpp>
+#include <test/utils/test_collector.hpp>
 #include <test/utils/test_driver.hpp>
-#include <test/utils/test_files.hpp>
 #include <iostream>
 
 namespace fs = std::filesystem;
diff --git a/test/statetest/statetest.cpp b/test/statetest/statetest.cpp
index 70d066e9ed..56a747e698 100644
--- a/test/statetest/statetest.cpp
+++ b/test/statetest/statetest.cpp
@@ -6,8 +6,8 @@
 #include <evmone/evmone.h>
 #include <evmone/version.h>
 #include <test/utils/statetest.hpp>
+#include <test/utils/test_collector.hpp>
 #include <test/utils/test_driver.hpp>
-#include <test/utils/test_files.hpp>
 #include <iostream>
 
 namespace fs = std::filesystem;
diff --git a/test/unittests/CMakeLists.txt b/test/unittests/CMakeLists.txt
index 442af5fbba..3bfc1410a4 100644
--- a/test/unittests/CMakeLists.txt
+++ b/test/unittests/CMakeLists.txt
@@ -85,8 +85,8 @@ target_sources(
     statetest_logs_hash_test.cpp
     statetest_runner_test.cpp
     statetest_withdrawals_test.cpp
+    test_collector_test.cpp
     test_driver_test.cpp
-    test_files_test.cpp
     test_report_test.cpp
     tooling_run_test.cpp
     tooling_t8n_test.cpp
diff --git a/test/unittests/test_files_test.cpp b/test/unittests/test_collector_test.cpp
similarity index 91%
rename from test/unittests/test_files_test.cpp
rename to test/unittests/test_collector_test.cpp
index ae5bccb033..bb4104976a 100644
--- a/test/unittests/test_files_test.cpp
+++ b/test/unittests/test_collector_test.cpp
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #include <gtest/gtest.h>
-#include <test/utils/test_files.hpp>
+#include <test/utils/test_collector.hpp>
 
 using namespace evmone::test;
 namespace fs = std::filesystem;
@@ -32,7 +32,7 @@ std::vector<std::string> names(const std::vector<TestFile>& files)
 }
 }  // namespace
 
-TEST(test_files, ignore_nothing)
+TEST(test_collector, ignore_nothing)
 {
     const std::vector<std::string> all{"a.json", "c.json", "b.json", "top.json"};
 
@@ -47,7 +47,7 @@ TEST(test_files, ignore_nothing)
     EXPECT_EQ(names(files), all);
 }
 
-TEST(test_files, ignore_directory)
+TEST(test_collector, ignore_directory)
 {
     // The sibling shares the prefix as text, but not as a path component.
     auto files = collected();
@@ -56,7 +56,7 @@ TEST(test_files, ignore_directory)
     EXPECT_EQ(names(files), (std::vector<std::string>{"b.json", "top.json"}));
 }
 
-TEST(test_files, ignore_directory_other_spellings)
+TEST(test_collector, ignore_directory_other_spellings)
 {
     for (const auto& spelling : {"bc4895/", "./bc4895"})
     {
@@ -67,7 +67,7 @@ TEST(test_files, ignore_directory_other_spellings)
     }
 }
 
-TEST(test_files, ignore_files)
+TEST(test_collector, ignore_files)
 {
     auto files = collected();
     const std::vector<fs::path> ignored{"bc4895/nested/c.json", "top.json"};
diff --git a/test/utils/CMakeLists.txt b/test/utils/CMakeLists.txt
index 98af270ddf..99657a6995 100644
--- a/test/utils/CMakeLists.txt
+++ b/test/utils/CMakeLists.txt
@@ -40,10 +40,10 @@ target_sources(
     statetest_runner.cpp
     t8n.hpp
     t8n.cpp
+    test_collector.hpp
+    test_collector.cpp
     test_driver.hpp
     test_driver.cpp
-    test_files.hpp
-    test_files.cpp
     test_report.hpp
     test_report.cpp
     test_state.hpp
diff --git a/test/utils/test_files.cpp b/test/utils/test_collector.cpp
similarity index 98%
rename from test/utils/test_files.cpp
rename to test/utils/test_collector.cpp
index 78921c0a4c..ab30751b91 100644
--- a/test/utils/test_files.cpp
+++ b/test/utils/test_collector.cpp
@@ -2,7 +2,7 @@
 // Copyright 2026 The evmone Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-#include "test_files.hpp"
+#include "test_collector.hpp"
 #include <algorithm>
 #include <ranges>
 
diff --git a/test/utils/test_files.hpp b/test/utils/test_collector.hpp
similarity index 100%
rename from test/utils/test_files.hpp
rename to test/utils/test_collector.hpp