diff --git a/tests/test_closing.py b/tests/test_closing.py
index 198d590b2..a6ff6f18a 100644
--- a/tests/test_closing.py
+++ b/tests/test_closing.py
@@ -732,6 +732,7 @@ def test_penalty_htlc_tx_fulfill(node_factory, bitcoind, chainparams):
                                may_reconnect=True,
                                options={'dev-no-reconnect': None})
     l2 = node_factory.get_node(options={'plugin': coin_mvt_plugin,
+                                        'disable-mpp': None,
                                         'dev-no-reconnect': None},
                                may_reconnect=True,
                                allow_broken_log=True)
@@ -910,11 +911,9 @@ def test_penalty_htlc_tx_timeout(node_factory, bitcoind, chainparams):
     # push some money so that 1 + 4 can both send htlcs
     inv = l1.rpc.invoice(10**9 // 2, '1', 'balancer')
     l2.rpc.pay(inv['bolt11'])
-    l2.rpc.waitsendpay(inv['payment_hash'])
 
     inv = l4.rpc.invoice(10**9 // 2, '1', 'balancer')
     l2.rpc.pay(inv['bolt11'])
-    l2.rpc.waitsendpay(inv['payment_hash'])
 
     # now we send two 'sticky' htlcs, l1->l5 + l4->l1
     amt = 10**8 // 2
diff --git a/tests/test_connection.py b/tests/test_connection.py
index 77bb0ab34..dab72e581 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -1963,7 +1963,7 @@ def test_fulfill_incoming_first(node_factory, bitcoind):
     # We manually reconnect l2 & l3, after 100 blocks; hence allowing manual
     # reconnect, but disabling auto connect, and massive cltv so 2/3 doesn't
     # time out.
-    l1, l2, l3 = node_factory.line_graph(3, opts=[{},
+    l1, l2, l3 = node_factory.line_graph(3, opts=[{'disable-mpp': None},
                                                   {'may_reconnect': True,
                                                    'dev-no-reconnect': None},
                                                   {'may_reconnect': True,
diff --git a/tests/test_pay.py b/tests/test_pay.py
index c350777b3..867cfb7f9 100644
--- a/tests/test_pay.py
+++ b/tests/test_pay.py
@@ -138,7 +138,11 @@ def test_pay_exclude_node(node_factory, bitcoind):
     """
     # FIXME: Remove our reliance on HTLCs failing on startup and the need for
     #        this plugin
-    opts = [{}, {'plugin': os.path.join(os.getcwd(), 'tests/plugins/fail_htlcs.py')}, {}]
+    opts = [
+        {'disable-mpp': None},
+        {'plugin': os.path.join(os.getcwd(), 'tests/plugins/fail_htlcs.py')},
+        {}
+    ]
     l1, l2, l3 = node_factory.line_graph(3, opts=opts, wait_for_announce=True)
     amount = 10**8
 
@@ -1615,7 +1619,7 @@ def test_pay_retry(node_factory, bitcoind, executor, chainparams):
     # We connect every node to l5; in a line and individually.
     # Keep fixed fees so we can easily calculate exhaustion
     l1, l2, l3, l4, l5 = node_factory.line_graph(5, fundchannel=False,
-                                                 opts={'feerates': (7500, 7500, 7500, 7500)})
+                                                 opts={'feerates': (7500, 7500, 7500, 7500), 'disable-mpp': None})
 
     # scid12
     l1.fund_channel(l2, 10**6, wait_for_active=False)