diff --git a/tests/test_misc.py b/tests/test_misc.py
index d5f2fcef6..be2cd4a42 100644
--- a/tests/test_misc.py
+++ b/tests/test_misc.py
@@ -3437,7 +3437,7 @@ def test_setconfig(node_factory, bitcoind):
 
     l1.fundchannel(l2, 10**6)
     txid = l1.rpc.close(l2.info['id'])['txid']
-    # Make sure we're completely closed! 
+    # Make sure we're completely closed!
     bitcoind.generate_block(1, wait_for_mempool=txid)
     sync_blockheight(bitcoind, [l1, l2])
 
diff --git a/tests/test_pay.py b/tests/test_pay.py
index 6159602cf..5a0ab89dc 100644
--- a/tests/test_pay.py
+++ b/tests/test_pay.py
@@ -71,6 +71,9 @@ def test_pay(node_factory):
     payments = l1.rpc.listsendpays(inv)['payments']
     assert len(payments) == 1 and payments[0]['payment_preimage'] == preimage
 
+    # Make sure they're completely settled, so accounting correct.
+    wait_for(lambda: only_one(l1.rpc.listpeerchannels()['channels'])['htlcs'] == [])
+
     # Check channels apy summary view of channel activity
     apys_1 = l1.rpc.bkpr_channelsapy()['channels_apy']
     apys_2 = l2.rpc.bkpr_channelsapy()['channels_apy']