diff --git a/test/functional/create_cache.py b/test/functional/create_cache.py
index 1108a8e3544be7..609e6f3f36ce2a 100755
--- a/test/functional/create_cache.py
+++ b/test/functional/create_cache.py
@@ -14,6 +14,9 @@
 class CreateCache(BitcoinTestFramework):
     # Test network and test nodes are not required:
 
+    def add_options(self, parser):
+        self.add_wallet_options(parser)
+
     def set_test_params(self):
         self.num_nodes = 0
 
diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py
index d8ae20981da672..93f608f2326dd3 100755
--- a/test/functional/test_framework/test_framework.py
+++ b/test/functional/test_framework/test_framework.py
@@ -814,7 +814,7 @@ def _initialize_chain(self):
                     cache_node_dir,
                     chain=self.chain,
                     extra_conf=["bind=127.0.0.1"],
-                    extra_args=['-disablewallet'],
+                    extra_args=[],
                     rpchost=None,
                     timewait=self.rpc_timeout,
                     timeout_factor=self.options.timeout_factor,
diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py
index 9bfc9aa7d4b175..14bd48dcdfa731 100755
--- a/test/functional/test_runner.py
+++ b/test/functional/test_runner.py
@@ -588,7 +588,7 @@ def run_tests(*, test_list, src_dir, build_dir, tmpdir, jobs=1, enable_coverage=
     if len(test_list) > 1 and jobs > 1:
         # Populate cache
         try:
-            subprocess.check_output([sys.executable, tests_dir + 'create_cache.py'] + flags + ["--tmpdir=%s/cache" % tmpdir])
+            subprocess.check_output([sys.executable, tests_dir + 'create_cache.py'] + flags + ["--tmpdir=%s/cache" % tmpdir] + ["--descriptors"])
         except subprocess.CalledProcessError as e:
             sys.stdout.buffer.write(e.output)
             raise