diff --git a/test/functional/fundrawtransaction-hd.py b/test/functional/fundrawtransaction-hd.py
index 29a64b29f2..630b1d59ca 100755
--- a/test/functional/fundrawtransaction-hd.py
+++ b/test/functional/fundrawtransaction-hd.py
@@ -442,9 +442,8 @@ class RawTransactionsTest(BitcoinTestFramework):
         self.stop_node(0)
         self.stop_node(2)
         self.stop_node(3)
-        self.nodes[1].encryptwallet("test")
+        self.nodes[1].node_encrypt_wallet("test")
         self.nodes.pop(1)
-        self.wait_node(1)
 
         self.nodes = self.start_nodes(4, self.options.tmpdir, [['-usehd=1']] * self.num_nodes, stderr=sys.stdout)
         # This test is not meant to test fee estimation and we'd like
diff --git a/test/functional/keypool-hd.py b/test/functional/keypool-hd.py
index a4be166b5d..fa9690cdf1 100755
--- a/test/functional/keypool-hd.py
+++ b/test/functional/keypool-hd.py
@@ -27,8 +27,7 @@ class KeyPoolTest(BitcoinTestFramework):
         assert(addr_before_encrypting_data['hdchainid'] == wallet_info_old['hdchainid'])
 
         # Encrypt wallet and wait to terminate
-        nodes[0].encryptwallet('test')
-        self.bitcoind_processes[0].wait()
+        nodes[0].node_encrypt_wallet('test')
         # Restart node 0
         nodes[0] = self.start_node(0, self.options.tmpdir, ['-usehd=1'], stderr=sys.stdout)
         # Keep creating keys