diff --git a/src/iceberg/test/arrow_fs_file_io_test.cc b/src/iceberg/test/arrow_fs_file_io_test.cc
index f1abf8d6d..eacda2f75 100644
--- a/src/iceberg/test/arrow_fs_file_io_test.cc
+++ b/src/iceberg/test/arrow_fs_file_io_test.cc
@@ -21,8 +21,8 @@
 #include <gtest/gtest.h>
 
 #include "iceberg/arrow/arrow_fs_file_io_internal.h"
-#include "matchers.h"
-#include "temp_file_test_base.h"
+#include "iceberg/test/matchers.h"
+#include "iceberg/test/temp_file_test_base.h"
 
 namespace iceberg {
 
diff --git a/src/iceberg/test/arrow_test.cc b/src/iceberg/test/arrow_test.cc
index d76020845..12039280e 100644
--- a/src/iceberg/test/arrow_test.cc
+++ b/src/iceberg/test/arrow_test.cc
@@ -31,7 +31,7 @@
 #include "iceberg/constants.h"
 #include "iceberg/schema.h"
 #include "iceberg/schema_internal.h"
-#include "matchers.h"
+#include "iceberg/test/matchers.h"
 
 namespace iceberg {
 
diff --git a/src/iceberg/test/avro_data_test.cc b/src/iceberg/test/avro_data_test.cc
index 2797f9bf6..a4a89a95e 100644
--- a/src/iceberg/test/avro_data_test.cc
+++ b/src/iceberg/test/avro_data_test.cc
@@ -34,8 +34,8 @@
 #include "iceberg/schema.h"
 #include "iceberg/schema_internal.h"
 #include "iceberg/schema_util.h"
+#include "iceberg/test/matchers.h"
 #include "iceberg/type.h"
-#include "matchers.h"
 
 namespace iceberg::avro {
 
diff --git a/src/iceberg/test/avro_schema_test.cc b/src/iceberg/test/avro_schema_test.cc
index 6870ee253..8fcc95675 100644
--- a/src/iceberg/test/avro_schema_test.cc
+++ b/src/iceberg/test/avro_schema_test.cc
@@ -28,7 +28,7 @@
 #include "iceberg/metadata_columns.h"
 #include "iceberg/name_mapping.h"
 #include "iceberg/schema.h"
-#include "matchers.h"
+#include "iceberg/test/matchers.h"
 
 namespace iceberg::avro {
 
diff --git a/src/iceberg/test/avro_stream_test.cc b/src/iceberg/test/avro_stream_test.cc
index 304e0516e..124e7b7ea 100644
--- a/src/iceberg/test/avro_stream_test.cc
+++ b/src/iceberg/test/avro_stream_test.cc
@@ -22,7 +22,7 @@
 #include <gtest/gtest.h>
 
 #include "iceberg/avro/avro_stream_internal.h"
-#include "temp_file_test_base.h"
+#include "iceberg/test/temp_file_test_base.h"
 
 namespace iceberg::avro {
 
diff --git a/src/iceberg/test/avro_test.cc b/src/iceberg/test/avro_test.cc
index 2bd09f925..4ca8ca148 100644
--- a/src/iceberg/test/avro_test.cc
+++ b/src/iceberg/test/avro_test.cc
@@ -34,9 +34,9 @@
 #include "iceberg/file_reader.h"
 #include "iceberg/schema.h"
 #include "iceberg/schema_internal.h"
+#include "iceberg/test/matchers.h"
+#include "iceberg/test/temp_file_test_base.h"
 #include "iceberg/type.h"
-#include "matchers.h"
-#include "temp_file_test_base.h"
 
 namespace iceberg::avro {
 
diff --git a/src/iceberg/test/bucket_util_test.cc b/src/iceberg/test/bucket_util_test.cc
index 8c80f04c2..9c0d46f00 100644
--- a/src/iceberg/test/bucket_util_test.cc
+++ b/src/iceberg/test/bucket_util_test.cc
@@ -23,9 +23,9 @@
 
 #include <gtest/gtest.h>
 
+#include "iceberg/test/temporal_test_helper.h"
 #include "iceberg/util/decimal.h"
 #include "iceberg/util/uuid.h"
-#include "temporal_test_helper.h"
 
 namespace iceberg {
 
diff --git a/src/iceberg/test/decimal_test.cc b/src/iceberg/test/decimal_test.cc
index 71ba67417..09fee1db4 100644
--- a/src/iceberg/test/decimal_test.cc
+++ b/src/iceberg/test/decimal_test.cc
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 #include "iceberg/util/decimal.h"
 
 #include <algorithm>
@@ -26,8 +27,8 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
+#include "iceberg/test/matchers.h"
 #include "iceberg/util/int128.h"
-#include "matchers.h"
 
 namespace iceberg {
 
diff --git a/src/iceberg/test/expression_test.cc b/src/iceberg/test/expression_test.cc
index 8baaf56f5..cce7c5334 100644
--- a/src/iceberg/test/expression_test.cc
+++ b/src/iceberg/test/expression_test.cc
@@ -23,7 +23,7 @@
 
 #include <gtest/gtest.h>
 
-#include "matchers.h"
+#include "iceberg/test/matchers.h"
 
 namespace iceberg {
 
diff --git a/src/iceberg/test/file_scan_task_test.cc b/src/iceberg/test/file_scan_task_test.cc
index b386d948c..51af7c0cb 100644
--- a/src/iceberg/test/file_scan_task_test.cc
+++ b/src/iceberg/test/file_scan_task_test.cc
@@ -33,10 +33,10 @@
 #include "iceberg/parquet/parquet_register.h"
 #include "iceberg/schema.h"
 #include "iceberg/table_scan.h"
+#include "iceberg/test/matchers.h"
+#include "iceberg/test/temp_file_test_base.h"
 #include "iceberg/type.h"
 #include "iceberg/util/checked_cast.h"
-#include "matchers.h"
-#include "temp_file_test_base.h"
 
 namespace iceberg {
 
diff --git a/src/iceberg/test/gzip_decompress_test.cc b/src/iceberg/test/gzip_decompress_test.cc
index 1325ba286..3415c46be 100644
--- a/src/iceberg/test/gzip_decompress_test.cc
+++ b/src/iceberg/test/gzip_decompress_test.cc
@@ -25,9 +25,9 @@
 
 #include "iceberg/arrow/arrow_fs_file_io_internal.h"
 #include "iceberg/file_io.h"
+#include "iceberg/test/matchers.h"
+#include "iceberg/test/temp_file_test_base.h"
 #include "iceberg/util/gzip_internal.h"
-#include "matchers.h"
-#include "temp_file_test_base.h"
 
 namespace iceberg {
 
diff --git a/src/iceberg/test/in_memory_catalog_test.cc b/src/iceberg/test/in_memory_catalog_test.cc
index da1804b82..adcf5fb4f 100644
--- a/src/iceberg/test/in_memory_catalog_test.cc
+++ b/src/iceberg/test/in_memory_catalog_test.cc
@@ -29,9 +29,9 @@
 #include "iceberg/schema.h"
 #include "iceberg/table.h"
 #include "iceberg/table_metadata.h"
-#include "matchers.h"
-#include "mock_catalog.h"
-#include "test_common.h"
+#include "iceberg/test/matchers.h"
+#include "iceberg/test/mock_catalog.h"
+#include "iceberg/test/test_common.h"
 
 namespace iceberg {
 
diff --git a/src/iceberg/test/json_internal_test.cc b/src/iceberg/test/json_internal_test.cc
index 3a557ed20..50f1e9175 100644
--- a/src/iceberg/test/json_internal_test.cc
+++ b/src/iceberg/test/json_internal_test.cc
@@ -31,11 +31,11 @@
 #include "iceberg/snapshot.h"
 #include "iceberg/sort_field.h"
 #include "iceberg/sort_order.h"
+#include "iceberg/test/matchers.h"
 #include "iceberg/transform.h"
 #include "iceberg/util/formatter.h"  // IWYU pragma: keep
 #include "iceberg/util/macros.h"     // IWYU pragma: keep
 #include "iceberg/util/timepoint.h"
-#include "matchers.h"
 
 namespace iceberg {
 
diff --git a/src/iceberg/test/literal_test.cc b/src/iceberg/test/literal_test.cc
index ca2a40621..084af12c5 100644
--- a/src/iceberg/test/literal_test.cc
+++ b/src/iceberg/test/literal_test.cc
@@ -25,9 +25,9 @@
 
 #include <gtest/gtest.h>
 
+#include "iceberg/test/matchers.h"
+#include "iceberg/test/temporal_test_helper.h"
 #include "iceberg/type.h"
-#include "matchers.h"
-#include "temporal_test_helper.h"
 
 namespace iceberg {
 
diff --git a/src/iceberg/test/manifest_list_reader_writer_test.cc b/src/iceberg/test/manifest_list_reader_writer_test.cc
index 793dd33b5..826786b07 100644
--- a/src/iceberg/test/manifest_list_reader_writer_test.cc
+++ b/src/iceberg/test/manifest_list_reader_writer_test.cc
@@ -26,9 +26,9 @@
 #include "iceberg/manifest_list.h"
 #include "iceberg/manifest_reader.h"
 #include "iceberg/manifest_writer.h"
-#include "matchers.h"
-#include "temp_file_test_base.h"
-#include "test_common.h"
+#include "iceberg/test/matchers.h"
+#include "iceberg/test/temp_file_test_base.h"
+#include "iceberg/test/test_common.h"
 
 namespace iceberg {
 
diff --git a/src/iceberg/test/manifest_reader_writer_test.cc b/src/iceberg/test/manifest_reader_writer_test.cc
index 8fed8b429..f4e770fbe 100644
--- a/src/iceberg/test/manifest_reader_writer_test.cc
+++ b/src/iceberg/test/manifest_reader_writer_test.cc
@@ -29,10 +29,10 @@
 #include "iceberg/manifest_reader.h"
 #include "iceberg/manifest_writer.h"
 #include "iceberg/schema.h"
+#include "iceberg/test/matchers.h"
+#include "iceberg/test/temp_file_test_base.h"
+#include "iceberg/test/test_common.h"
 #include "iceberg/transform.h"
-#include "matchers.h"
-#include "temp_file_test_base.h"
-#include "test_common.h"
 
 namespace iceberg {
 
diff --git a/src/iceberg/test/metadata_io_test.cc b/src/iceberg/test/metadata_io_test.cc
index aff1e9a42..8613ae244 100644
--- a/src/iceberg/test/metadata_io_test.cc
+++ b/src/iceberg/test/metadata_io_test.cc
@@ -30,8 +30,8 @@
 #include "iceberg/schema.h"
 #include "iceberg/snapshot.h"
 #include "iceberg/table_metadata.h"
-#include "matchers.h"
-#include "temp_file_test_base.h"
+#include "iceberg/test/matchers.h"
+#include "iceberg/test/temp_file_test_base.h"
 
 namespace iceberg {
 
diff --git a/src/iceberg/test/metadata_serde_test.cc b/src/iceberg/test/metadata_serde_test.cc
index 744a55c75..9c1dd4bcc 100644
--- a/src/iceberg/test/metadata_serde_test.cc
+++ b/src/iceberg/test/metadata_serde_test.cc
@@ -31,10 +31,10 @@
 #include "iceberg/sort_order.h"
 #include "iceberg/statistics_file.h"
 #include "iceberg/table_metadata.h"
+#include "iceberg/test/matchers.h"
+#include "iceberg/test/test_common.h"
 #include "iceberg/transform.h"
 #include "iceberg/type.h"
-#include "matchers.h"
-#include "test_common.h"
 
 namespace iceberg {
 
diff --git a/src/iceberg/test/parquet_data_test.cc b/src/iceberg/test/parquet_data_test.cc
index bc8f421c3..be8031639 100644
--- a/src/iceberg/test/parquet_data_test.cc
+++ b/src/iceberg/test/parquet_data_test.cc
@@ -29,8 +29,8 @@
 #include "iceberg/schema.h"
 #include "iceberg/schema_internal.h"
 #include "iceberg/schema_util.h"
+#include "iceberg/test/matchers.h"
 #include "iceberg/type.h"
-#include "matchers.h"
 
 namespace iceberg::parquet {
 
diff --git a/src/iceberg/test/parquet_schema_test.cc b/src/iceberg/test/parquet_schema_test.cc
index 99f0b690b..a9da3f9f7 100644
--- a/src/iceberg/test/parquet_schema_test.cc
+++ b/src/iceberg/test/parquet_schema_test.cc
@@ -26,8 +26,8 @@
 #include "iceberg/metadata_columns.h"
 #include "iceberg/parquet/parquet_schema_util_internal.h"
 #include "iceberg/schema.h"
+#include "iceberg/test/matchers.h"
 #include "iceberg/type.h"
-#include "matchers.h"
 
 namespace iceberg::parquet {
 
diff --git a/src/iceberg/test/parquet_test.cc b/src/iceberg/test/parquet_test.cc
index c6df838a5..cbf49fb1d 100644
--- a/src/iceberg/test/parquet_test.cc
+++ b/src/iceberg/test/parquet_test.cc
@@ -39,10 +39,10 @@
 #include "iceberg/schema.h"
 #include "iceberg/schema_field.h"
 #include "iceberg/schema_internal.h"
+#include "iceberg/test/matchers.h"
 #include "iceberg/type.h"
 #include "iceberg/util/checked_cast.h"
 #include "iceberg/util/macros.h"
-#include "matchers.h"
 
 namespace iceberg::parquet {
 
diff --git a/src/iceberg/test/predicate_test.cc b/src/iceberg/test/predicate_test.cc
index f34df47d4..ca38769b3 100644
--- a/src/iceberg/test/predicate_test.cc
+++ b/src/iceberg/test/predicate_test.cc
@@ -19,8 +19,8 @@
 
 #include "iceberg/expression/expressions.h"
 #include "iceberg/schema.h"
+#include "iceberg/test/matchers.h"
 #include "iceberg/type.h"
-#include "matchers.h"
 
 namespace iceberg {
 
diff --git a/src/iceberg/test/schema_test.cc b/src/iceberg/test/schema_test.cc
index 3d10fb824..d99e9b3c3 100644
--- a/src/iceberg/test/schema_test.cc
+++ b/src/iceberg/test/schema_test.cc
@@ -19,7 +19,6 @@
 
 #include "iceberg/schema.h"
 
-#include <format>
 #include <memory>
 #include <thread>
 
@@ -29,8 +28,8 @@
 #include "gtest/gtest.h"
 #include "iceberg/result.h"
 #include "iceberg/schema_field.h"
+#include "iceberg/test/matchers.h"
 #include "iceberg/util/formatter.h"  // IWYU pragma: keep
-#include "matchers.h"
 
 template <typename... Args>
 std::shared_ptr<iceberg::StructType> MakeStructType(Args&&... args) {
diff --git a/src/iceberg/test/schema_util_test.cc b/src/iceberg/test/schema_util_test.cc
index e124061d4..fe6579ab3 100644
--- a/src/iceberg/test/schema_util_test.cc
+++ b/src/iceberg/test/schema_util_test.cc
@@ -27,8 +27,8 @@
 #include "iceberg/metadata_columns.h"
 #include "iceberg/schema.h"
 #include "iceberg/schema_field.h"
+#include "iceberg/test/matchers.h"
 #include "iceberg/type.h"
-#include "matchers.h"
 
 namespace iceberg {
 
diff --git a/src/iceberg/test/struct_like_test.cc b/src/iceberg/test/struct_like_test.cc
index 484b25439..b18ab8c0f 100644
--- a/src/iceberg/test/struct_like_test.cc
+++ b/src/iceberg/test/struct_like_test.cc
@@ -28,7 +28,7 @@
 #include "iceberg/row/arrow_array_wrapper.h"
 #include "iceberg/row/manifest_wrapper.h"
 #include "iceberg/schema_internal.h"
-#include "matchers.h"
+#include "iceberg/test/matchers.h"
 
 namespace iceberg {
 
diff --git a/src/iceberg/test/table_test.cc b/src/iceberg/test/table_test.cc
index 56f475de0..680491034 100644
--- a/src/iceberg/test/table_test.cc
+++ b/src/iceberg/test/table_test.cc
@@ -32,7 +32,7 @@
 #include "iceberg/schema.h"
 #include "iceberg/snapshot.h"
 #include "iceberg/table_metadata.h"
-#include "test_common.h"
+#include "iceberg/test/test_common.h"
 
 namespace iceberg {
 
diff --git a/src/iceberg/test/test_common.cc b/src/iceberg/test/test_common.cc
index 8c992c9bd..eb0bbe938 100644
--- a/src/iceberg/test/test_common.cc
+++ b/src/iceberg/test/test_common.cc
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include "test_common.h"
+#include "iceberg/test/test_common.h"
 
 #include <filesystem>
 #include <fstream>
diff --git a/src/iceberg/test/transform_test.cc b/src/iceberg/test/transform_test.cc
index 6d72bdce9..90f7abb5b 100644
--- a/src/iceberg/test/transform_test.cc
+++ b/src/iceberg/test/transform_test.cc
@@ -27,10 +27,10 @@
 #include <gtest/gtest.h>
 
 #include "iceberg/expression/literal.h"
+#include "iceberg/test/matchers.h"
+#include "iceberg/test/temporal_test_helper.h"
 #include "iceberg/type.h"
 #include "iceberg/util/formatter.h"  // IWYU pragma: keep
-#include "matchers.h"
-#include "temporal_test_helper.h"
 
 namespace iceberg {
 
diff --git a/src/iceberg/test/type_test.cc b/src/iceberg/test/type_test.cc
index 4fd8c46c1..82379540b 100644
--- a/src/iceberg/test/type_test.cc
+++ b/src/iceberg/test/type_test.cc
@@ -28,8 +28,8 @@
 #include <gtest/gtest.h>
 
 #include "iceberg/exception.h"
+#include "iceberg/test/matchers.h"
 #include "iceberg/util/formatter.h"  // IWYU pragma: keep
-#include "matchers.h"
 
 struct TypeTestCase {
   /// Test case name, must be safe for Googletest (alphanumeric + underscore)
diff --git a/src/iceberg/test/uuid_test.cc b/src/iceberg/test/uuid_test.cc
index 3dbe573b2..ea2daf566 100644
--- a/src/iceberg/test/uuid_test.cc
+++ b/src/iceberg/test/uuid_test.cc
@@ -23,7 +23,7 @@
 
 #include <gtest/gtest.h>
 
-#include "matchers.h"
+#include "iceberg/test/matchers.h"
 
 namespace iceberg {
 
diff --git a/src/iceberg/test/visit_type_test.cc b/src/iceberg/test/visit_type_test.cc
index 6eb0aafc3..8adc85b4a 100644
--- a/src/iceberg/test/visit_type_test.cc
+++ b/src/iceberg/test/visit_type_test.cc
@@ -25,8 +25,8 @@
 #include <gtest/gtest.h>
 
 #include "iceberg/result.h"
+#include "iceberg/test/matchers.h"
 #include "iceberg/type.h"
-#include "matchers.h"
 
 namespace iceberg {