diff --git a/configure.ac b/configure.ac
index 676085d9bd..5f4458737b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.69])
 define(_CLIENT_VERSION_MAJOR, 23)
 define(_CLIENT_VERSION_MINOR, 2)
 define(_CLIENT_VERSION_BUILD, 6)
-define(_CLIENT_VERSION_RC, 1)
+define(_CLIENT_VERSION_RC, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2025)
 define(_COPYRIGHT_HOLDERS,[The %s developers])
diff --git a/test/functional/example_elements_code_tutorial.py b/test/functional/example_elements_code_tutorial.py
index feb645f1f1..138750ec53 100755
--- a/test/functional/example_elements_code_tutorial.py
+++ b/test/functional/example_elements_code_tutorial.py
@@ -25,6 +25,7 @@ def set_test_params(self):
 
     def skip_test_if_missing_module(self):
         self.skip_if_no_wallet()
+        self.skip_if_no_bdb()
 
     def run_test(self):
         self.generate(self.nodes[0], COINBASE_MATURITY + 1)
diff --git a/test/functional/feature_discount_ct.py b/test/functional/feature_discount_ct.py
index 84e2c096b1..0c949ba27e 100755
--- a/test/functional/feature_discount_ct.py
+++ b/test/functional/feature_discount_ct.py
@@ -36,6 +36,7 @@ def set_test_params(self):
 
     def skip_test_if_missing_module(self):
         self.skip_if_no_wallet()
+        self.skip_if_no_bdb()
 
     def run_test(self):
         feerate = 1.0
diff --git a/test/functional/feature_discount_ct_ordering.py b/test/functional/feature_discount_ct_ordering.py
index aed8a1f0db..2b9e1554e2 100755
--- a/test/functional/feature_discount_ct_ordering.py
+++ b/test/functional/feature_discount_ct_ordering.py
@@ -33,6 +33,7 @@ def set_test_params(self):
 
     def skip_test_if_missing_module(self):
         self.skip_if_no_wallet()
+        self.skip_if_no_bdb()
 
     def run_test(self):
 
diff --git a/test/functional/feature_taphash_pegins_issuances.py b/test/functional/feature_taphash_pegins_issuances.py
index e4716e8ebc..21ad004948 100755
--- a/test/functional/feature_taphash_pegins_issuances.py
+++ b/test/functional/feature_taphash_pegins_issuances.py
@@ -41,6 +41,7 @@ def set_test_params(self):
 
     def skip_test_if_missing_module(self):
         self.skip_if_no_wallet()
+        self.skip_if_no_bdb()
 
     def setup_network(self, split=False):
         self.setup_nodes()
diff --git a/test/functional/feature_tapscript_opcodes.py b/test/functional/feature_tapscript_opcodes.py
index 8772a08d72..5dbb62bc69 100755
--- a/test/functional/feature_tapscript_opcodes.py
+++ b/test/functional/feature_tapscript_opcodes.py
@@ -45,6 +45,7 @@ def set_test_params(self):
 
     def skip_test_if_missing_module(self):
         self.skip_if_no_wallet()
+        self.skip_if_no_bdb()
 
     def setup_network(self, split=False):
         self.setup_nodes()
diff --git a/test/functional/feature_trim_headers.py b/test/functional/feature_trim_headers.py
index 8d44ee92a9..93926c752f 100755
--- a/test/functional/feature_trim_headers.py
+++ b/test/functional/feature_trim_headers.py
@@ -39,6 +39,7 @@ def make_signblockscript(num_nodes, required_signers, keys):
 class TrimHeadersTest(BitcoinTestFramework):
     def skip_test_if_missing_module(self):
         self.skip_if_no_wallet()
+        self.skip_if_no_bdb()
 
     # Dynamically generate N keys to be used for block signing.
     def init_keys(self, num_keys):
diff --git a/test/functional/wallet_elements_21million.py b/test/functional/wallet_elements_21million.py
index f9faafdbea..ea6b34dd6f 100755
--- a/test/functional/wallet_elements_21million.py
+++ b/test/functional/wallet_elements_21million.py
@@ -50,8 +50,8 @@ def run_test(self):
         assert_equal(self.nodes[1].getbalance()[asset], 22_000_000)
 
         # unload/load wallet
-        self.nodes[1].unloadwallet("")
-        self.nodes[1].loadwallet("")
+        self.nodes[1].unloadwallet(self.default_wallet_name)
+        self.nodes[1].loadwallet(self.default_wallet_name)
         assert_equal(self.nodes[1].getbalance()[asset], 22_000_000)
 
         # send more than 45 million of that asset
@@ -62,8 +62,8 @@ def run_test(self):
         assert_equal(self.nodes[2].getbalance()[asset], 46_000_000)
 
         # unload/load wallet
-        self.nodes[2].unloadwallet("")
-        self.nodes[2].loadwallet("")
+        self.nodes[2].unloadwallet(self.default_wallet_name)
+        self.nodes[2].loadwallet(self.default_wallet_name)
         assert_equal(self.nodes[2].getbalance()[asset], 46_000_000)
 
         # send some policy asset to node 1 for fees
@@ -86,8 +86,8 @@ def run_test(self):
         assert_equal(self.nodes[2].getbalance()[asset], 200_000_000)
 
         # unload/load wallet
-        self.nodes[2].unloadwallet("")
-        self.nodes[2].loadwallet("")
+        self.nodes[2].unloadwallet(self.default_wallet_name)
+        self.nodes[2].loadwallet(self.default_wallet_name)
         assert_equal(self.nodes[2].getbalance()[asset], 200_000_000)
 
 if __name__ == '__main__':
diff --git a/test/functional/wallet_elements_regression_1263.py b/test/functional/wallet_elements_regression_1263.py
index c4f713c8e3..2f5ce36ebe 100755
--- a/test/functional/wallet_elements_regression_1263.py
+++ b/test/functional/wallet_elements_regression_1263.py
@@ -19,6 +19,7 @@ def set_test_params(self):
 
     def skip_test_if_missing_module(self):
         self.skip_if_no_wallet()
+        self.skip_if_no_bdb()
 
     def run_test(self):
         self.log.info("Start in Bitcoin regtest mode")