diff --git a/src/policy/fees.cpp b/src/policy/fees.cpp
index 9f576e738a5..d64360e82d1 100644
--- a/src/policy/fees.cpp
+++ b/src/policy/fees.cpp
@@ -998,13 +998,24 @@ void CBlockPolicyEstimator::FlushUnconfirmed() {
     LogPrint(BCLog::ESTIMATEFEE, "Recorded %u unconfirmed txs from mempool in %gs\n", num_entries, (endclear - startclear)*0.000001);
 }
 
-FeeFilterRounder::FeeFilterRounder(const CFeeRate& minIncrementalFee)
+static std::set<double> MakeFeeSet(const CFeeRate& minIncrementalFee,
+                                   double max_filter_fee_rate,
+                                   double fee_filter_spacing)
 {
-    CAmount minFeeLimit = std::max(CAmount(1), minIncrementalFee.GetFeePerK() / 2);
+    std::set<double> feeset;
+
+    const CAmount minFeeLimit{std::max(CAmount(1), minIncrementalFee.GetFeePerK() / 2)};
     feeset.insert(0);
-    for (double bucketBoundary = minFeeLimit; bucketBoundary <= MAX_FILTER_FEERATE; bucketBoundary *= FEE_FILTER_SPACING) {
+    for (double bucketBoundary = minFeeLimit; bucketBoundary <= max_filter_fee_rate; bucketBoundary *= fee_filter_spacing) {
         feeset.insert(bucketBoundary);
     }
+
+    return feeset;
+}
+
+FeeFilterRounder::FeeFilterRounder(const CFeeRate& minIncrementalFee)
+    : feeset{MakeFeeSet(minIncrementalFee, MAX_FILTER_FEERATE, FEE_FILTER_SPACING)}
+{
 }
 
 CAmount FeeFilterRounder::round(CAmount currentMinFee)
diff --git a/src/policy/fees.h b/src/policy/fees.h
index c7fa1a0b777..e7f45c3151e 100644
--- a/src/policy/fees.h
+++ b/src/policy/fees.h
@@ -303,7 +303,7 @@ public:
     CAmount round(CAmount currentMinFee);
 
 private:
-    std::set<double> feeset;
+    const std::set<double> feeset;
     Mutex m_insecure_rand_mutex;
     FastRandomContext insecure_rand GUARDED_BY(m_insecure_rand_mutex);
 };