diff --git a/Makefile b/Makefile
index 9f233ab3e..704c3c69c 100644
--- a/Makefile
+++ b/Makefile
@@ -272,7 +272,7 @@ ifeq ($(PYTEST),)
 	exit 1
 else
 # Explicitly hand DEVELOPER and VALGRIND so you can override on make cmd line.
-	PYTHONPATH=`pwd`/contrib/pyln-client:`pwd`/contrib/pyln-testing:`pwd`/contrib/pylightning:`pwd`/contrib/pyln-proto/:$(PYTHONPATH) TEST_DEBUG=1 DEVELOPER=$(DEVELOPER) VALGRIND=$(VALGRIND) $(PYTEST) tests/ $(PYTEST_OPTS)
+	PYTHONPATH=`pwd`/contrib/pyln-client:`pwd`/contrib/pyln-testing:`pwd`/contrib/pyln-proto/:$(PYTHONPATH) TEST_DEBUG=1 DEVELOPER=$(DEVELOPER) VALGRIND=$(VALGRIND) $(PYTEST) tests/ $(PYTEST_OPTS)
 endif
 
 # Keep includes in alpha order.
diff --git a/contrib/plugins/helloworld.py b/contrib/plugins/helloworld.py
index d74b96627..1a5ede345 100755
--- a/contrib/plugins/helloworld.py
+++ b/contrib/plugins/helloworld.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-from lightning import Plugin
+from pyln.client import Plugin
 import time
 
 plugin = Plugin()
diff --git a/tests/plugins/accepter_close_to.py b/tests/plugins/accepter_close_to.py
index 1b027b74f..3711154d8 100755
--- a/tests/plugins/accepter_close_to.py
+++ b/tests/plugins/accepter_close_to.py
@@ -9,7 +9,7 @@
       - otherwise: we don't include the close_to
 """
 
-from lightning import Plugin, Millisatoshi
+from pyln.client import Plugin, Millisatoshi
 
 plugin = Plugin()
 
diff --git a/tests/plugins/asynctest.py b/tests/plugins/asynctest.py
index 97dd4df61..9566a670c 100755
--- a/tests/plugins/asynctest.py
+++ b/tests/plugins/asynctest.py
@@ -6,7 +6,7 @@ stashed away, and are only resolved on the fifth invocation. All calls
 will then return the argument of the fifth call.
 
 """
-from lightning import Plugin
+from pyln.client import Plugin
 
 plugin = Plugin()
 
diff --git a/tests/plugins/broken.py b/tests/plugins/broken.py
index 28b871c88..4a88b9bfe 100755
--- a/tests/plugins/broken.py
+++ b/tests/plugins/broken.py
@@ -3,7 +3,7 @@
 misbehaving plugin via RPC.
 """
 
-from lightning import Plugin
+from pyln.client import Plugin
 import an_unexistent_module_that_will_make_me_crash
 
 plugin = Plugin(dynamic=False)
diff --git a/tests/plugins/dblog.py b/tests/plugins/dblog.py
index 85a0ade61..ef9eb79e1 100755
--- a/tests/plugins/dblog.py
+++ b/tests/plugins/dblog.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 """This plugin is used to check that db_write calls are working correctly.
 """
-from lightning import Plugin, RpcError
+from pyln.client import Plugin, RpcError
 import sqlite3
 
 plugin = Plugin()
diff --git a/tests/plugins/fail_htlcs.py b/tests/plugins/fail_htlcs.py
index 9141549a0..59a37b3ff 100755
--- a/tests/plugins/fail_htlcs.py
+++ b/tests/plugins/fail_htlcs.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from lightning import Plugin
+from pyln.client import Plugin
 
 plugin = Plugin()
 
diff --git a/tests/plugins/forward_payment_status.py b/tests/plugins/forward_payment_status.py
index 1bb35a810..12a15aee5 100755
--- a/tests/plugins/forward_payment_status.py
+++ b/tests/plugins/forward_payment_status.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 """This plugin is used to check that forward_event calls are working correctly.
 """
-from lightning import Plugin
+from pyln.client import Plugin
 
 plugin = Plugin()
 
diff --git a/tests/plugins/hold_htlcs.py b/tests/plugins/hold_htlcs.py
index cd8799343..3b9e5caaa 100755
--- a/tests/plugins/hold_htlcs.py
+++ b/tests/plugins/hold_htlcs.py
@@ -7,7 +7,7 @@ settled/forwarded/
 """
 
 
-from lightning import Plugin
+from pyln.client import Plugin
 import json
 import os
 import tempfile
diff --git a/tests/plugins/hold_invoice.py b/tests/plugins/hold_invoice.py
index b3190db5e..b3a0f3760 100755
--- a/tests/plugins/hold_invoice.py
+++ b/tests/plugins/hold_invoice.py
@@ -2,7 +2,7 @@
 """Simple plugin to allow testing while closing of HTLC is delayed.
 """
 
-from lightning import Plugin
+from pyln.client import Plugin
 import time
 
 plugin = Plugin()
diff --git a/tests/plugins/millisatoshis.py b/tests/plugins/millisatoshis.py
index 5404aa8e0..2155a3fd8 100755
--- a/tests/plugins/millisatoshis.py
+++ b/tests/plugins/millisatoshis.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-from lightning import Plugin, Millisatoshi
+from pyln.client import Plugin, Millisatoshi
 
 
 plugin = Plugin(autopatch=True)
diff --git a/tests/plugins/misc_notifications.py b/tests/plugins/misc_notifications.py
index 9742b4263..79d416abb 100755
--- a/tests/plugins/misc_notifications.py
+++ b/tests/plugins/misc_notifications.py
@@ -4,7 +4,7 @@
 Only used for 'channel_opened' for now.
 """
 
-from lightning import Plugin
+from pyln.client import Plugin
 
 plugin = Plugin()
 
diff --git a/tests/plugins/options.py b/tests/plugins/options.py
index 6eb7bb6c5..c8e6b0fbd 100755
--- a/tests/plugins/options.py
+++ b/tests/plugins/options.py
@@ -3,7 +3,7 @@
 
 The plugin offers 3 options, one of each supported type.
 """
-from lightning import Plugin
+from pyln.client import Plugin
 
 plugin = Plugin()
 
diff --git a/tests/plugins/pretend_badlog.py b/tests/plugins/pretend_badlog.py
index 23c7ec877..a255fe118 100755
--- a/tests/plugins/pretend_badlog.py
+++ b/tests/plugins/pretend_badlog.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 """This plugin is used to check that warning(unusual/broken level log) calls are working correctly.
 """
-from lightning import Plugin
+from pyln.client import Plugin
 
 plugin = Plugin()
 
diff --git a/tests/plugins/print_htlc_onion.py b/tests/plugins/print_htlc_onion.py
index a97cc0ced..f1557dd20 100755
--- a/tests/plugins/print_htlc_onion.py
+++ b/tests/plugins/print_htlc_onion.py
@@ -5,7 +5,7 @@ We use this to check whether they're TLV or not
 
 """
 
-from lightning import Plugin
+from pyln.client import Plugin
 
 plugin = Plugin()
 
diff --git a/tests/plugins/reject.py b/tests/plugins/reject.py
index da39519ee..cf34b49b9 100755
--- a/tests/plugins/reject.py
+++ b/tests/plugins/reject.py
@@ -7,7 +7,7 @@ continue.
 
 """
 
-from lightning import Plugin
+from pyln.client import Plugin
 
 plugin = Plugin()
 
diff --git a/tests/plugins/reject_odd_funding_amounts.py b/tests/plugins/reject_odd_funding_amounts.py
index 6dc5dc310..eb3460f91 100755
--- a/tests/plugins/reject_odd_funding_amounts.py
+++ b/tests/plugins/reject_odd_funding_amounts.py
@@ -4,7 +4,7 @@
 We just refuse to let them open channels with an odd amount of millisatoshis.
 """
 
-from lightning import Plugin, Millisatoshi
+from pyln.client import Plugin, Millisatoshi
 
 plugin = Plugin()
 
diff --git a/tests/plugins/reject_some_invoices.py b/tests/plugins/reject_some_invoices.py
index 1c5b3d2cd..321e4e7a2 100755
--- a/tests/plugins/reject_some_invoices.py
+++ b/tests/plugins/reject_some_invoices.py
@@ -4,7 +4,7 @@
 We just refuse to let them pay invoices with preimages divisible by 16.
 """
 
-from lightning import Plugin
+from pyln.client import Plugin
 
 plugin = Plugin()
 
diff --git a/tests/plugins/rpc_command.py b/tests/plugins/rpc_command.py
index 3d951246e..a993a8d6a 100755
--- a/tests/plugins/rpc_command.py
+++ b/tests/plugins/rpc_command.py
@@ -2,7 +2,7 @@
 """
 This plugin is used to test the `rpc_command` hook.
 """
-from lightning import Plugin
+from pyln.client import Plugin
 
 plugin = Plugin()
 
diff --git a/tests/plugins/sendpay_notifications.py b/tests/plugins/sendpay_notifications.py
index 418fb9434..0f83290d2 100755
--- a/tests/plugins/sendpay_notifications.py
+++ b/tests/plugins/sendpay_notifications.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 """This plugin is used to check that sendpay_success and sendpay_failure calls are working correctly.
 """
-from lightning import Plugin
+from pyln.client import Plugin
 
 plugin = Plugin()
 
diff --git a/tests/plugins/shortcircuit.py b/tests/plugins/shortcircuit.py
index 8403b68ec..bdb088c15 100755
--- a/tests/plugins/shortcircuit.py
+++ b/tests/plugins/shortcircuit.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from lightning import Plugin
+from pyln.client import Plugin
 
 plugin = Plugin()
 
diff --git a/tests/plugins/slow_init.py b/tests/plugins/slow_init.py
index 8587531be..82881d7d3 100755
--- a/tests/plugins/slow_init.py
+++ b/tests/plugins/slow_init.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-from lightning import Plugin
+from pyln.client import Plugin
 import time
 
 plugin = Plugin()
diff --git a/tests/plugins/static.py b/tests/plugins/static.py
index ff89eeffc..daa9ac3fa 100755
--- a/tests/plugins/static.py
+++ b/tests/plugins/static.py
@@ -5,7 +5,7 @@ A plugin started with dynamic to False cannot be controlled after lightningd
 has been started.
 """
 
-from lightning import Plugin
+from pyln.client import Plugin
 
 plugin = Plugin(dynamic=False)
 
diff --git a/tests/plugins/utf8.py b/tests/plugins/utf8.py
index 52cce06d4..16c3afe45 100755
--- a/tests/plugins/utf8.py
+++ b/tests/plugins/utf8.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-from lightning import Plugin
+from pyln.client import Plugin
 
 
 plugin = Plugin()