diff --git a/test/functional/test_framework/address.py b/test/functional/test_framework/address.py
--- a/test/functional/test_framework/address.py
+++ b/test/functional/test_framework/address.py
@@ -4,7 +4,7 @@
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 """Encode and decode BASE58, P2PKH and P2SH addresses."""
 
-from .script import hash256, hash160, CScript
+from .script import CScript, hash160, hash256
 from .util import bytes_to_hex_str, hex_str_to_bytes
 
 chars = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz'
diff --git a/test/functional/test_framework/blockstore.py b/test/functional/test_framework/blockstore.py
--- a/test/functional/test_framework/blockstore.py
+++ b/test/functional/test_framework/blockstore.py
@@ -4,9 +4,17 @@
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 """BlockStore and TxStore helper classes."""
 
-from .mininode import *
-from io import BytesIO
 import dbm.dumb as dbmd
+from io import BytesIO
+import logging
+
+from .messages import (
+    CBlock,
+    CBlockHeader,
+    CBlockLocator,
+    msg_headers,
+    msg_generic,
+)
 
 logger = logging.getLogger("TestFramework.blockstore")
 
diff --git a/test/functional/test_framework/blocktools.py b/test/functional/test_framework/blocktools.py
--- a/test/functional/test_framework/blocktools.py
+++ b/test/functional/test_framework/blocktools.py
@@ -4,11 +4,29 @@
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 """Utilities for manipulating blocks and transactions."""
 
-from .mininode import *
-from .script import CScript, OP_TRUE, OP_CHECKSIG, OP_RETURN, OP_PUSHDATA2, OP_DUP, OP_HASH160, OP_EQUALVERIFY
-from .mininode import CTransaction, CTxOut, CTxIn
-from .util import satoshi_round
+from .script import (
+    CScript,
+    OP_CHECKSIG,
+    OP_DUP,
+    OP_EQUALVERIFY,
+    OP_HASH160,
+    OP_PUSHDATA2,
+    OP_RETURN,
+    OP_TRUE,
+)
+from .messages import (
+    CBlock,
+    COIN,
+    COutPoint,
+    CTransaction,
+    CTxIn,
+    CTxOut,
+    FromHex,
+    ToHex,
+    ser_string,
+)
 from .txtools import pad_tx
+from .util import satoshi_round
 
 # Create a block (with regtest difficulty)
 
diff --git a/test/functional/test_framework/comptool.py b/test/functional/test_framework/comptool.py
--- a/test/functional/test_framework/comptool.py
+++ b/test/functional/test_framework/comptool.py
@@ -17,11 +17,25 @@
     on_getdata: provide blocks via BlockStore
 """
 
-from .mininode import *
+import logging
+
 from .blockstore import BlockStore, TxStore
+from .messages import (
+    CBlock,
+    CBlockHeader,
+    CInv,
+    CTransaction,
+    MAX_INV_SZ,
+    msg_block,
+    msg_getheaders,
+    msg_headers,
+    msg_inv,
+    msg_mempool,
+    msg_ping,
+)
+from .mininode import mininode_lock, P2PInterface
 from .util import p2p_port, wait_until
 
-import logging
 
 logger = logging.getLogger("TestFramework.comptool")
 
diff --git a/test/functional/test_framework/messages.py b/test/functional/test_framework/messages.py
--- a/test/functional/test_framework/messages.py
+++ b/test/functional/test_framework/messages.py
@@ -24,7 +24,7 @@
 import time
 
 from test_framework.siphash import siphash256
-from test_framework.util import hex_str_to_bytes, bytes_to_hex_str
+from test_framework.util import bytes_to_hex_str, hex_str_to_bytes
 
 MIN_VERSION_SUPPORTED = 60001
 # past bip-31 for ping/pong
diff --git a/test/functional/test_framework/mininode.py b/test/functional/test_framework/mininode.py
--- a/test/functional/test_framework/mininode.py
+++ b/test/functional/test_framework/mininode.py
@@ -20,7 +20,33 @@
 import sys
 import threading
 
-from test_framework.messages import *
+from test_framework.messages import (
+    MIN_VERSION_SUPPORTED,
+    msg_addr,
+    msg_block,
+    msg_blocktxn,
+    msg_cmpctblock,
+    msg_feefilter,
+    msg_getaddr,
+    msg_getblocks,
+    msg_getblocktxn,
+    msg_getdata,
+    msg_getheaders,
+    msg_headers,
+    msg_inv,
+    msg_mempool,
+    msg_ping,
+    msg_pong,
+    msg_reject,
+    msg_sendcmpct,
+    msg_sendheaders,
+    msg_tx,
+    msg_verack,
+    msg_version,
+    NODE_NETWORK,
+    READ_BUFFER_SIZE,
+    sha256,
+)
 from test_framework.util import wait_until
 
 logger = logging.getLogger("TestFramework.mininode")
diff --git a/test/functional/test_framework/netutil.py b/test/functional/test_framework/netutil.py
--- a/test/functional/test_framework/netutil.py
+++ b/test/functional/test_framework/netutil.py
@@ -7,13 +7,13 @@
 Roughly based on http://voorloopnul.com/blog/a-python-netstat-in-less-than-100-lines-of-code/ by Ricardo Pascal
 """
 
-import sys
-import socket
-import fcntl
-import struct
 import array
-import os
 from binascii import unhexlify, hexlify
+import fcntl
+import os
+import socket
+import struct
+import sys
 
 # STATE_ESTABLISHED = '01'
 # STATE_SYN_SENT = '02'
diff --git a/test/functional/test_framework/script.py b/test/functional/test_framework/script.py
--- a/test/functional/test_framework/script.py
+++ b/test/functional/test_framework/script.py
@@ -7,13 +7,22 @@
 This file is modified from python-bitcoinlib.
 """
 
-from .mininode import CTransaction, CTxOut, sha256, hash256, uint256_from_str, ser_uint256, ser_string
 from .bignum import bn2vch
 from binascii import hexlify
 import hashlib
 import struct
-
 import sys
+
+from .messages import (
+    CTransaction,
+    CTxOut,
+    hash256,
+    ser_string,
+    ser_uint256,
+    sha256,
+    uint256_from_str,
+)
+
 bchr = chr
 bord = ord
 if sys.version > '3':
diff --git a/test/functional/test_framework/socks5.py b/test/functional/test_framework/socks5.py
--- a/test/functional/test_framework/socks5.py
+++ b/test/functional/test_framework/socks5.py
@@ -4,10 +4,10 @@
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 """Dummy Socks5 server for testing."""
 
+import logging
+import queue
 import socket
 import threading
-import queue
-import logging
 
 logger = logging.getLogger("TestFramework.socks5")
 
diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py
--- a/test/functional/test_framework/test_framework.py
+++ b/test/functional/test_framework/test_framework.py
@@ -4,10 +4,10 @@
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 """Base class for RPC testing."""
 
+import argparse
 from collections import deque
 from enum import Enum
 import logging
-import argparse
 import os
 import pdb
 import shutil
@@ -20,15 +20,15 @@
 from . import coverage
 from .test_node import TestNode
 from .util import (
-    MAX_NODES,
-    PortSeed,
     assert_equal,
     check_json_precision,
     connect_nodes_bi,
     disconnect_nodes,
     initialize_datadir,
     log_filename,
+    MAX_NODES,
     p2p_port,
+    PortSeed,
     rpc_port,
     set_node_times,
     sync_blocks,
diff --git a/test/functional/test_framework/test_node.py b/test/functional/test_framework/test_node.py
--- a/test/functional/test_framework/test_node.py
+++ b/test/functional/test_framework/test_node.py
@@ -15,13 +15,13 @@
 import time
 
 from .authproxy import JSONRPCException
-from .mininode import COIN, FromHex, CTransaction
+from .messages import COIN, CTransaction, FromHex
 from .util import (
     assert_equal,
     get_rpc_proxy,
+    p2p_port,
     rpc_url,
     wait_until,
-    p2p_port,
 )
 
 # For Python 3.4 compatibility
diff --git a/test/functional/test_framework/txtools.py b/test/functional/test_framework/txtools.py
--- a/test/functional/test_framework/txtools.py
+++ b/test/functional/test_framework/txtools.py
@@ -1,9 +1,9 @@
-from .cdefs import MIN_TX_SIZE, MAX_TXOUT_PUBKEY_SCRIPT
-from .mininode import CTransaction, FromHex, ToHex, CTxOut
-from .script import OP_RETURN, CScript
-
 import random
 
+from .cdefs import MAX_TXOUT_PUBKEY_SCRIPT, MIN_TX_SIZE
+from .messages import CTransaction, CTxOut, FromHex, ToHex
+from .script import CScript, OP_RETURN
+
 
 def pad_tx(tx, pad_to_size=MIN_TX_SIZE):
     """