diff --git a/test/functional/wallet_basic.py b/test/functional/wallet_basic.py
--- a/test/functional/wallet_basic.py
+++ b/test/functional/wallet_basic.py
@@ -14,7 +14,6 @@
     assert_raises_rpc_error,
     connect_nodes,
     count_bytes,
-    wait_until,
 )
 from test_framework.wallet_util import test_address
 
@@ -497,10 +496,11 @@
                 2, self.extra_args[2] + [m, "-limitancestorcount=" + str(chainlimit)])
             if m == '-reindex':
                 # reindex will leave rpc warm up "early"; Wait for it to finish
-                wait_until(lambda: [block_count] * 3 ==
-                           [self.nodes[i].getblockcount() for i in range(3)])
-            assert_equal(balance_nodes, [
-                         self.nodes[i].getbalance() for i in range(3)])
+                self.wait_until(
+                    lambda: [block_count] * 3 ==
+                            [self.nodes[i].getblockcount() for i in range(3)])
+            assert_equal(balance_nodes,
+                         [self.nodes[i].getbalance() for i in range(3)])
 
         # Exercise listsinceblock with the last two blocks
         coinbase_tx_1 = self.nodes[0].listsinceblock(blocks[0])
@@ -559,10 +559,8 @@
                                               "-limitancestorcount=" + str(2 * chainlimit)])
 
         # wait until the wallet has submitted all transactions to the mempool
-        wait_until(
-            lambda: len(
-                self.nodes[0].getrawmempool()) == chainlimit *
-            2)
+        self.wait_until(
+            lambda: len(self.nodes[0].getrawmempool()) == chainlimit * 2)
 
         node0_balance = self.nodes[0].getbalance()
         # With walletrejectlongchains we will not create the tx and store it in