diff --git a/tests/test_connection.py b/tests/test_connection.py
index 58ffe9c0f..96810d90a 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -1,5 +1,6 @@
 from collections import namedtuple
 from fixtures import *  # noqa: F401,F403
+from flaky import flaky  # noqa: F401
 from lightning import RpcError
 from utils import DEVELOPER, only_one, wait_for, sync_blockheight, VALGRIND
 
@@ -565,6 +566,7 @@ def test_reconnect_receiver_fulfill(node_factory):
     assert only_one(l2.rpc.listinvoices('testpayment2')['invoices'])['status'] == 'paid'
 
 
+@flaky
 @unittest.skipIf(not DEVELOPER, "needs DEVELOPER=1")
 def test_shutdown_reconnect(node_factory):
     disconnects = ['-WIRE_SHUTDOWN',
diff --git a/tests/test_misc.py b/tests/test_misc.py
index 9fba052bf..b53bc7b98 100644
--- a/tests/test_misc.py
+++ b/tests/test_misc.py
@@ -1,6 +1,6 @@
 from decimal import Decimal
 from fixtures import *  # noqa: F401,F403
-from flaky import flaky
+from flaky import flaky  # noqa: F401
 from lightning import RpcError
 from utils import DEVELOPER, VALGRIND, sync_blockheight, only_one, wait_for, TailableProc
 from ephemeral_port_reserve import reserve
diff --git a/tests/test_pay.py b/tests/test_pay.py
index e0918ad1c..87c6b1e22 100644
--- a/tests/test_pay.py
+++ b/tests/test_pay.py
@@ -1,4 +1,5 @@
 from fixtures import *  # noqa: F401,F403
+from flaky import flaky  # noqa: F401
 from lightning import RpcError, Millisatoshi
 from utils import DEVELOPER, wait_for, only_one, sync_blockheight, SLOW_MACHINE
 
@@ -1614,6 +1615,7 @@ def test_pay_routeboost(node_factory, bitcoind):
         assert [h['channel'] for h in attempts[2]['routehint']] == [r['short_channel_id'] for r in routel3l5]
 
 
+@flaky
 @unittest.skipIf(not DEVELOPER, "gossip without DEVELOPER=1 is slow")
 def test_pay_direct(node_factory, bitcoind):
     """Check that we prefer the direct route.
diff --git a/tests/test_plugin.py b/tests/test_plugin.py
index ae9d1a3c2..7eef9e3fd 100644
--- a/tests/test_plugin.py
+++ b/tests/test_plugin.py
@@ -1,5 +1,6 @@
 from collections import OrderedDict
 from fixtures import *  # noqa: F401,F403
+from flaky import flaky  # noqa: F401
 from lightning import RpcError, Millisatoshi
 from utils import only_one, wait_for