diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index 5c614ab33b1..2ccc44297d2 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -24,6 +24,7 @@ add_executable(test_bitcoin
   blockfilter_index_tests.cpp
   blockfilter_tests.cpp
   blockmanager_tests.cpp
+  blockpolicyestimator_tests.cpp
   bloom_tests.cpp
   bswap_tests.cpp
   btcsignals_tests.cpp
@@ -76,7 +77,6 @@ add_executable(test_bitcoin
   pcp_tests.cpp
   peerman_tests.cpp
   pmt_tests.cpp
-  policyestimator_tests.cpp
   pool_tests.cpp
   pow_tests.cpp
   prevector_tests.cpp
diff --git a/src/test/policyestimator_tests.cpp b/src/test/blockpolicyestimator_tests.cpp
similarity index 99%
rename from src/test/policyestimator_tests.cpp
rename to src/test/blockpolicyestimator_tests.cpp
index d13a0d1ebf6..294f3a32da1 100644
--- a/src/test/policyestimator_tests.cpp
+++ b/src/test/blockpolicyestimator_tests.cpp
@@ -15,7 +15,7 @@
 
 #include <boost/test/unit_test.hpp>
 
-BOOST_FIXTURE_TEST_SUITE(policyestimator_tests, ChainTestingSetup)
+BOOST_FIXTURE_TEST_SUITE(blockpolicyestimator_tests, ChainTestingSetup)
 
 BOOST_AUTO_TEST_CASE(BlockPolicyEstimates)
 {
diff --git a/src/test/fuzz/CMakeLists.txt b/src/test/fuzz/CMakeLists.txt
index 7888f149008..3e1b5a09114 100644
--- a/src/test/fuzz/CMakeLists.txt
+++ b/src/test/fuzz/CMakeLists.txt
@@ -20,6 +20,7 @@ add_executable(fuzz
   block_header.cpp
   block_index.cpp
   block_index_tree.cpp
+  block_policy_estimator.cpp
   blockfilter.cpp
   bloom_filter.cpp
   buffered_file.cpp
@@ -89,7 +90,6 @@ add_executable(fuzz
   parse_script.cpp
   parse_univalue.cpp
   partially_downloaded_block.cpp
-  policy_estimator.cpp
   policy_estimator_io.cpp
   poolresource.cpp
   pow.cpp
diff --git a/src/test/fuzz/policy_estimator.cpp b/src/test/fuzz/block_policy_estimator.cpp
similarity index 97%
rename from src/test/fuzz/policy_estimator.cpp
rename to src/test/fuzz/block_policy_estimator.cpp
index 1e137a674dd..2efc1fc12e1 100644
--- a/src/test/fuzz/policy_estimator.cpp
+++ b/src/test/fuzz/block_policy_estimator.cpp
@@ -21,13 +21,13 @@ namespace {
 const BasicTestingSetup* g_setup;
 } // namespace
 
-void initialize_policy_estimator()
+void initialize_block_policy_estimator()
 {
     static const auto testing_setup = MakeNoLogFileContext<>();
     g_setup = testing_setup.get();
 }
 
-FUZZ_TARGET(policy_estimator, .init = initialize_policy_estimator)
+FUZZ_TARGET(block_policy_estimator, .init = initialize_block_policy_estimator)
 {
     FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
     bool good_data{true};