diff --git a/test/boost/filtering_test.cc b/test/boost/filtering_test.cc
index 14016eba9ac2..634c3470351f 100644
--- a/test/boost/filtering_test.cc
+++ b/test/boost/filtering_test.cc
@@ -15,6 +15,7 @@
 
 #include <seastar/net/inet_address.hh>
 
+#include "test/lib/eventually.hh"
 #include "test/lib/scylla_test_case.hh"
 #include "test/lib/cql_test_env.hh"
 #include "test/lib/cql_assertions.hh"
diff --git a/test/boost/index_with_paging_test.cc b/test/boost/index_with_paging_test.cc
index 6e6a828d79b8..f47349653b21 100644
--- a/test/boost/index_with_paging_test.cc
+++ b/test/boost/index_with_paging_test.cc
@@ -9,6 +9,7 @@
 #include "test/lib/scylla_test_case.hh"
 #include "test/lib/cql_test_env.hh"
 #include "test/lib/cql_assertions.hh"
+#include "test/lib/eventually.hh"
 #include "cql3/untyped_result_set.hh"
 #include "cql3/query_processor.hh"
 #include "transport/messages/result_message.hh"
diff --git a/test/boost/mutation_reader_test.cc b/test/boost/mutation_reader_test.cc
index c76566e19336..5e691e305f4f 100644
--- a/test/boost/mutation_reader_test.cc
+++ b/test/boost/mutation_reader_test.cc
@@ -22,6 +22,7 @@
 #include "sstables/generation_type.hh"
 #include "test/lib/scylla_test_case.hh"
 #include <seastar/testing/thread_test_case.hh>
+#include "test/lib/eventually.hh"
 #include "test/lib/mutation_assertions.hh"
 #include "test/lib/flat_mutation_reader_assertions.hh"
 #include "test/lib/sstable_utils.hh"
diff --git a/test/boost/secondary_index_test.cc b/test/boost/secondary_index_test.cc
index ad649148b2f3..9c70fb1bc5ee 100644
--- a/test/boost/secondary_index_test.cc
+++ b/test/boost/secondary_index_test.cc
@@ -7,17 +7,18 @@
  */
 
 #include <seastar/core/coroutine.hh>
-#include "test/lib/scylla_test_case.hh"
 #include "test/lib/cql_test_env.hh"
 #include "test/lib/cql_assertions.hh"
+#include "test/lib/eventually.hh"
+#include "test/lib/exception_utils.hh"
+#include "test/lib/scylla_test_case.hh"
+#include "test/lib/select_statement_utils.hh"
 #include "transport/messages/result_message.hh"
 #include "service/pager/paging_state.hh"
 #include "types/map.hh"
 #include "types/list.hh"
 #include "types/set.hh"
-#include "test/lib/exception_utils.hh"
 #include "cql3/statements/select_statement.hh"
-#include "test/lib/select_statement_utils.hh"
 #include "utils/error_injection.hh"
 
 using namespace std::chrono_literals;
diff --git a/test/boost/view_build_test.cc b/test/boost/view_build_test.cc
index 2864e8a01e65..bb68fc78f4a9 100644
--- a/test/boost/view_build_test.cc
+++ b/test/boost/view_build_test.cc
@@ -23,6 +23,7 @@
 
 #include "test/lib/cql_test_env.hh"
 #include "test/lib/cql_assertions.hh"
+#include "test/lib/eventually.hh"
 #include "test/lib/sstable_utils.hh"
 #include "schema/schema_builder.hh"
 #include "test/lib/data_model.hh"
diff --git a/test/boost/view_complex_test.cc b/test/boost/view_complex_test.cc
index 1f33cc98626f..4e1337bfbf4f 100644
--- a/test/boost/view_complex_test.cc
+++ b/test/boost/view_complex_test.cc
@@ -17,6 +17,7 @@
 #include "test/lib/scylla_test_case.hh"
 #include "test/lib/cql_test_env.hh"
 #include "test/lib/cql_assertions.hh"
+#include "test/lib/eventually.hh"
 
 #include "db/config.hh"
 
diff --git a/test/boost/view_schema_ckey_test.cc b/test/boost/view_schema_ckey_test.cc
index 97e5a71a7c7b..e67cc425fb90 100644
--- a/test/boost/view_schema_ckey_test.cc
+++ b/test/boost/view_schema_ckey_test.cc
@@ -14,6 +14,7 @@
 #include <seastar/testing/thread_test_case.hh>
 #include "test/lib/cql_test_env.hh"
 #include "test/lib/cql_assertions.hh"
+#include "test/lib/eventually.hh"
 
 using namespace std::literals::chrono_literals;
 
diff --git a/test/boost/view_schema_pkey_test.cc b/test/boost/view_schema_pkey_test.cc
index 45f20663fef4..37f553e8a68b 100644
--- a/test/boost/view_schema_pkey_test.cc
+++ b/test/boost/view_schema_pkey_test.cc
@@ -12,6 +12,7 @@
 
 #include "db/view/view_builder.hh"
 
+#include "test/lib/eventually.hh"
 #include "test/lib/scylla_test_case.hh"
 #include <seastar/testing/thread_test_case.hh>
 #include "test/lib/cql_test_env.hh"
diff --git a/test/boost/view_schema_test.cc b/test/boost/view_schema_test.cc
index 8165770168d7..d2d45a3ce443 100644
--- a/test/boost/view_schema_test.cc
+++ b/test/boost/view_schema_test.cc
@@ -20,6 +20,7 @@
 #include <seastar/testing/thread_test_case.hh>
 #include "test/lib/cql_test_env.hh"
 #include "test/lib/cql_assertions.hh"
+#include "test/lib/eventually.hh"
 #include "exceptions/unrecognized_entity_exception.hh"
 #include "db/config.hh"
 #include "types/set.hh"
diff --git a/test/lib/cql_assertions.cc b/test/lib/cql_assertions.cc
index a980bfbb0522..a3d7c2e857a6 100644
--- a/test/lib/cql_assertions.cc
+++ b/test/lib/cql_assertions.cc
@@ -11,6 +11,7 @@
 #include <boost/range/adaptor/transformed.hpp>
 #include <fmt/ranges.h>
 #include "test/lib/cql_assertions.hh"
+#include "test/lib/eventually.hh"
 #include "transport/messages/result_message.hh"
 #include "utils/to_string.hh"
 #include "bytes.hh"
diff --git a/test/lib/cql_test_env.cc b/test/lib/cql_test_env.cc
index f1057efe5761..fff80491d70d 100644
--- a/test/lib/cql_test_env.cc
+++ b/test/lib/cql_test_env.cc
@@ -12,8 +12,6 @@
 #include <seastar/core/thread.hh>
 #include <seastar/util/defer.hh>
 #include "replica/database_fwd.hh"
-#include "sstables/sstables.hh"
-#include <seastar/core/do_with.hh>
 #include "test/lib/cql_test_env.hh"
 #include "cdc/generation_service.hh"
 #include "cql3/functions/functions.hh"
@@ -29,7 +27,6 @@
 #include <seastar/core/scheduling.hh>
 #include <seastar/core/reactor.hh>
 #include <seastar/core/coroutine.hh>
-#include "utils/UUID_gen.hh"
 #include "service/migration_manager.hh"
 #include "service/tablet_allocator.hh"
 #include "compaction/compaction_manager.hh"
@@ -46,7 +43,6 @@
 #include "db/batchlog_manager.hh"
 #include "schema/schema_builder.hh"
 #include "test/lib/tmpdir.hh"
-#include "test/lib/test_services.hh"
 #include "test/lib/log.hh"
 #include "unit_test_service_levels_accessor.hh"
 #include "db/view/view_builder.hh"
diff --git a/test/lib/cql_test_env.hh b/test/lib/cql_test_env.hh
index 120c6de868e1..f92f4c193207 100644
--- a/test/lib/cql_test_env.hh
+++ b/test/lib/cql_test_env.hh
@@ -25,7 +25,6 @@
 #include "bytes.hh"
 #include "schema/schema.hh"
 #include "service/tablet_allocator.hh"
-#include "test/lib/eventually.hh"
 
 namespace replica {
 class database;
diff --git a/test/lib/key_utils.cc b/test/lib/key_utils.cc
index d8e8482f268a..7c44be9ea932 100644
--- a/test/lib/key_utils.cc
+++ b/test/lib/key_utils.cc
@@ -9,7 +9,6 @@
 #include "test/lib/key_utils.hh"
 #include "test/lib/random_schema.hh"
 #include "test/lib/random_utils.hh"
-#include "test/lib/test_utils.hh"
 #include "dht/i_partitioner.hh"
 
 namespace tests {
diff --git a/test/lib/random_schema.cc b/test/lib/random_schema.cc
index 88f4b8060d2a..b9dd270d4dc9 100644
--- a/test/lib/random_schema.cc
+++ b/test/lib/random_schema.cc
@@ -12,9 +12,9 @@
 
 #include "cql3/cql3_type.hh"
 #include "mutation/mutation.hh"
-#include "mutation/mutation_fragment.hh"
 #include "schema/schema_builder.hh"
 #include "test/lib/cql_test_env.hh"
+#include "test/lib/eventually.hh"
 #include "test/lib/random_schema.hh"
 #include "test/lib/random_utils.hh"
 #include "types/list.hh"
diff --git a/test/lib/tmpdir.cc b/test/lib/tmpdir.cc
index 0a248b9efbf3..412965d0d36e 100644
--- a/test/lib/tmpdir.cc
+++ b/test/lib/tmpdir.cc
@@ -7,6 +7,7 @@
  */
 
 #include "test/lib/tmpdir.hh"
+#include "utils/UUID.hh"
 
 #include <seastar/util/alloc_failure_injector.hh>
 
diff --git a/test/lib/tmpdir.hh b/test/lib/tmpdir.hh
index 807ebe32458b..2d7c1d3db70b 100644
--- a/test/lib/tmpdir.hh
+++ b/test/lib/tmpdir.hh
@@ -12,8 +12,6 @@
 
 #include <seastar/util/std-compat.hh>
 
-#include "utils/UUID.hh"
-
 namespace fs = std::filesystem;
 
 // Creates a new empty directory with arbitrary name, which will be removed