diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py
index a781da2720..6746fbf9f9 100755
--- a/test/functional/test_framework/test_framework.py
+++ b/test/functional/test_framework/test_framework.py
@@ -431,7 +431,7 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass):
             n = self.nodes[node]
             if wallet_name is not None:
                 n.createwallet(wallet_name=wallet_name, descriptors=self.options.descriptors, load_on_startup=True)
-            n.importprivkey(privkey=n.get_deterministic_priv_key().key, label='coinbase')
+            n.importprivkey(privkey=n.get_deterministic_priv_key().key, label='coinbase', rescan=True)
 
     def run_test(self):
         """Tests must override this method to define test logic"""
diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py
index ab5740d1aa..b9b4edf0ba 100755
--- a/test/functional/test_runner.py
+++ b/test/functional/test_runner.py
@@ -217,7 +217,8 @@ BASE_SCRIPTS = [
     'rpc_getblockfilter.py',
     'rpc_invalidateblock.py',
     'feature_utxo_set_hash.py',
-    'feature_rbf.py',
+    'feature_rbf.py --legacy-wallet',
+    'feature_rbf.py --descriptors',
     'mempool_packages.py',
     'mempool_package_onemore.py',
     'rpc_createmultisig.py --legacy-wallet',