diff --git a/tests/test_closing.py b/tests/test_closing.py
index ace7be0e0..0e8700d50 100644
--- a/tests/test_closing.py
+++ b/tests/test_closing.py
@@ -1,7 +1,10 @@
 from fixtures import *  # noqa: F401,F403
 from flaky import flaky
-from lightning import RpcError
-from utils import only_one, sync_blockheight, wait_for, DEVELOPER, TIMEOUT, VALGRIND, SLOW_MACHINE, COMPAT
+from pyln.client import RpcError
+from utils import (
+    only_one, sync_blockheight, wait_for, DEVELOPER, TIMEOUT, VALGRIND,
+    SLOW_MACHINE, COMPAT
+)
 
 import os
 import queue
diff --git a/tests/test_connection.py b/tests/test_connection.py
index 7316e1298..849c28b59 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -3,8 +3,11 @@ from decimal import Decimal
 from fixtures import *  # noqa: F401,F403
 from fixtures import TEST_NETWORK
 from flaky import flaky  # noqa: F401
-from lightning import RpcError
-from utils import DEVELOPER, only_one, wait_for, sync_blockheight, VALGRIND, TIMEOUT, SLOW_MACHINE, COMPAT, expected_features
+from pyln.client import RpcError
+from utils import (
+    DEVELOPER, only_one, wait_for, sync_blockheight, VALGRIND, TIMEOUT,
+    SLOW_MACHINE, COMPAT, expected_features
+)
 from bitcoin.core import CMutableTransaction, CMutableTxOut
 
 import binascii
diff --git a/tests/test_gossip.py b/tests/test_gossip.py
index 71e3aab6c..e678a0755 100644
--- a/tests/test_gossip.py
+++ b/tests/test_gossip.py
@@ -2,8 +2,10 @@ from collections import Counter
 from ephemeral_port_reserve import reserve
 from fixtures import *  # noqa: F401,F403
 from fixtures import TEST_NETWORK
-from lightning import RpcError
-from utils import wait_for, TIMEOUT, only_one, sync_blockheight, expected_features
+from pyln.client import RpcError
+from utils import (
+    wait_for, TIMEOUT, only_one, sync_blockheight, expected_features
+)
 
 import json
 import logging
diff --git a/tests/test_invoices.py b/tests/test_invoices.py
index 1eef03495..ec3a450ba 100644
--- a/tests/test_invoices.py
+++ b/tests/test_invoices.py
@@ -1,6 +1,6 @@
 from fixtures import *  # noqa: F401,F403
 from fixtures import TEST_NETWORK
-from lightning import RpcError
+from pyln.client import RpcError
 from utils import only_one, DEVELOPER, wait_for, wait_channel_quiescent
 
 
diff --git a/tests/test_misc.py b/tests/test_misc.py
index ea40d3e10..e10e7cac0 100644
--- a/tests/test_misc.py
+++ b/tests/test_misc.py
@@ -3,9 +3,12 @@ from decimal import Decimal
 from fixtures import *  # noqa: F401,F403
 from fixtures import LightningNode, TEST_NETWORK
 from flaky import flaky  # noqa: F401
-from lightning import RpcError
+from pyln.client import RpcError
 from threading import Event
-from pyln.testing.utils import DEVELOPER, TIMEOUT, VALGRIND, sync_blockheight, only_one, wait_for, TailableProc, env
+from pyln.testing.utils import (
+    DEVELOPER, TIMEOUT, VALGRIND, sync_blockheight, only_one, wait_for,
+    TailableProc, env
+)
 from ephemeral_port_reserve import reserve
 
 import json
diff --git a/tests/test_pay.py b/tests/test_pay.py
index 567da67b4..da974239b 100644
--- a/tests/test_pay.py
+++ b/tests/test_pay.py
@@ -2,8 +2,11 @@ from binascii import hexlify
 from fixtures import *  # noqa: F401,F403
 from fixtures import TEST_NETWORK
 from flaky import flaky  # noqa: F401
-from lightning import RpcError, Millisatoshi
-from utils import DEVELOPER, wait_for, only_one, sync_blockheight, SLOW_MACHINE, TIMEOUT, VALGRIND
+from pyln.client import RpcError, Millisatoshi
+from utils import (
+    DEVELOPER, wait_for, only_one, sync_blockheight, SLOW_MACHINE, TIMEOUT,
+    VALGRIND
+)
 
 import concurrent.futures
 import copy
diff --git a/tests/test_plugin.py b/tests/test_plugin.py
index 515acf7e5..0d2a86688 100644
--- a/tests/test_plugin.py
+++ b/tests/test_plugin.py
@@ -1,8 +1,10 @@
 from collections import OrderedDict
 from fixtures import *  # noqa: F401,F403
 from flaky import flaky  # noqa: F401
-from lightning import RpcError, Millisatoshi
-from utils import DEVELOPER, only_one, sync_blockheight, TIMEOUT, wait_for, TEST_NETWORK
+from pyln.client import RpcError, Millisatoshi
+from utils import (
+    DEVELOPER, only_one, sync_blockheight, TIMEOUT, wait_for, TEST_NETWORK
+)
 
 import json
 import os
diff --git a/tests/test_wallet.py b/tests/test_wallet.py
index 01f496894..0d46e3487 100644
--- a/tests/test_wallet.py
+++ b/tests/test_wallet.py
@@ -2,8 +2,11 @@ from decimal import Decimal
 from fixtures import *  # noqa: F401,F403
 from fixtures import TEST_NETWORK
 from flaky import flaky  # noqa: F401
-from lightning import RpcError, Millisatoshi
-from utils import only_one, wait_for, sync_blockheight, EXPERIMENTAL_FEATURES, COMPAT, VALGRIND
+from pyln.client import RpcError, Millisatoshi
+from utils import (
+    only_one, wait_for, sync_blockheight, EXPERIMENTAL_FEATURES, COMPAT,
+    VALGRIND
+)
 
 import os
 import pytest