diff --git a/spalloc/_keepalive_process.py b/spalloc/_keepalive_process.py
index df4166410..c358db5d4 100644
--- a/spalloc/_keepalive_process.py
+++ b/spalloc/_keepalive_process.py
@@ -1,11 +1,9 @@
 """ A script for keeping Spalloc jobs alive, intended to only ever be run\
     from the Spalloc client itself.
 """
-
-
-from spalloc.protocol_client import ProtocolClient, ProtocolTimeoutError
 import sys
 import threading
+from spalloc.protocol_client import ProtocolClient, ProtocolTimeoutError
 
 
 def wait_for_exit(stop_event):
diff --git a/spalloc/config.py b/spalloc/config.py
index 428a3c56c..26e2c99ab 100644
--- a/spalloc/config.py
+++ b/spalloc/config.py
@@ -64,16 +64,13 @@
     requires the allocation of a whole machine. If False, wrap-around links may
     or may-not be present in allocated machines. (Default: False)
 """
-
+# pylint: disable=import-error
 import os
 import os.path
 import appdirs
-
 from six import iteritems
-# pylint: disable=import-error
 from six.moves.configparser import ConfigParser, NoOptionError
 
-
 # The application name to use in config file names
 _name = "spalloc"
 
diff --git a/spalloc/job.py b/spalloc/job.py
index e47a8f4a0..a8b9319c8 100644
--- a/spalloc/job.py
+++ b/spalloc/job.py
@@ -6,7 +6,6 @@
 import subprocess
 import time
 import sys
-
 from .protocol_client import ProtocolClient, ProtocolTimeoutError
 from .config import read_config, SEARCH_PATH
 from .states import JobState
diff --git a/spalloc/protocol_client.py b/spalloc/protocol_client.py
index 94adc44b6..78716f8db 100644
--- a/spalloc/protocol_client.py
+++ b/spalloc/protocol_client.py
@@ -1,14 +1,14 @@
 """ A simple blocking spalloc_server protocol implementation.
 """
 
-import socket
-import json
-from threading import current_thread, RLock, local
 from collections import deque
-from spalloc._utils import time_left, timed_out, make_timeout
 import errno
+import json
+import socket
 import sys
+from threading import current_thread, RLock, local
 from six import raise_from
+from spalloc._utils import time_left, timed_out, make_timeout
 
 
 class ProtocolError(Exception):
diff --git a/spalloc/scripts/alloc.py b/spalloc/scripts/alloc.py
index 644541003..2747ef48d 100644
--- a/spalloc/scripts/alloc.py
+++ b/spalloc/scripts/alloc.py
@@ -95,22 +95,19 @@
 messages are sent automatically but after exiting the commands are no longer
 sent. Adding the ``--keepalive -1`` option when creating a job disables this.
 """
-
 import argparse
 from collections import OrderedDict
 import logging
 import os
-from six import iteritems
-from six.moves import input, shlex_quote  # @UnresolvedImport
 import subprocess
 import sys
 import tempfile
-
-from spalloc import config
-from spalloc import Job, JobState, __version__
+from six import iteritems
+from six.moves import input, shlex_quote  # @UnresolvedImport
+from spalloc import (
+    config, Job, JobState, __version__, ProtocolError, ProtocolTimeoutError,
+    SpallocServerException)
 from spalloc.term import Terminal, render_definitions
-from spalloc import ProtocolError, ProtocolTimeoutError, SpallocServerException
-
 # Rig is used to implement the optional '--boot' facility.
 try:
     from rig.machine_control import MachineController
diff --git a/spalloc/scripts/job.py b/spalloc/scripts/job.py
index 77ac972c4..a2c04a3ba 100644
--- a/spalloc/scripts/job.py
+++ b/spalloc/scripts/job.py
@@ -62,14 +62,13 @@
 import argparse
 from collections import OrderedDict
 import datetime
-from pytz import utc
-from six import iteritems
 import sys
+from pytz import utc
 from tzlocal import get_localzone
-
+from six import iteritems
 from spalloc import __version__, JobState
-from spalloc.term import \
-    Terminal, render_definitions, render_boards, DEFAULT_BOARD_EDGES
+from spalloc.term import (
+    Terminal, render_definitions, render_boards, DEFAULT_BOARD_EDGES)
 from .support import Terminate, Script
 
 
diff --git a/spalloc/scripts/machine.py b/spalloc/scripts/machine.py
index 56b0a5808..70919bec2 100644
--- a/spalloc/scripts/machine.py
+++ b/spalloc/scripts/machine.py
@@ -17,16 +17,14 @@
 """
 import argparse
 from collections import defaultdict, OrderedDict
-from six import next  # pylint: disable=redefined-builtin
 import sys
-
+from six import next  # pylint: disable=redefined-builtin
 from spalloc import __version__
-from spalloc.term import \
-    Terminal, render_table, render_definitions, render_boards, render_cells, \
-    DEFAULT_BOARD_EDGES
+from spalloc.term import (
+    Terminal, render_table, render_definitions, render_boards, render_cells,
+    DEFAULT_BOARD_EDGES)
 from .support import Terminate, Script
 
-
 # The acceptable range of server version numbers
 VERSION_RANGE_START = (0, 1, 0)
 VERSION_RANGE_STOP = (2, 0, 0)
diff --git a/spalloc/scripts/ps.py b/spalloc/scripts/ps.py
index 568aa1107..ce235967c 100644
--- a/spalloc/scripts/ps.py
+++ b/spalloc/scripts/ps.py
@@ -10,13 +10,11 @@
 This list may be filtered by owner or machine with the ``--owner`` and
 ``--machine`` arguments.
 """
-
 import argparse
 import datetime
-from pytz import utc
 import sys
+from pytz import utc
 from tzlocal import get_localzone
-
 from spalloc import __version__, JobState
 from spalloc.term import Terminal, render_table
 from .support import Script
diff --git a/spalloc/scripts/support.py b/spalloc/scripts/support.py
index 60c732f05..c77ecc549 100644
--- a/spalloc/scripts/support.py
+++ b/spalloc/scripts/support.py
@@ -1,7 +1,7 @@
 import sys
-from spalloc import config
-from spalloc import \
-    ProtocolClient, ProtocolError, ProtocolTimeoutError, SpallocServerException
+from spalloc import (
+    config, ProtocolClient, ProtocolError, ProtocolTimeoutError,
+    SpallocServerException)
 
 # The acceptable range of server version numbers
 VERSION_RANGE_START = (0, 1, 0)
diff --git a/spalloc/scripts/where_is.py b/spalloc/scripts/where_is.py
index 30ae4b06d..c5e153868 100644
--- a/spalloc/scripts/where_is.py
+++ b/spalloc/scripts/where_is.py
@@ -52,9 +52,7 @@
 """
 import sys
 import argparse
-
 from collections import OrderedDict
-
 from spalloc import __version__
 from spalloc.term import render_definitions
 from .support import Terminate, Script
diff --git a/spalloc/term.py b/spalloc/term.py
index 83e1f2acc..965a13faf 100644
--- a/spalloc/term.py
+++ b/spalloc/term.py
@@ -3,14 +3,11 @@
 
 import os
 import sys
-
-from functools import partial
 from itertools import chain
 from collections import defaultdict
-
-from six import iteritems, string_types
-
 from enum import IntEnum
+from functools import partial
+from six import iteritems, string_types
 
 
 class ANSIDisplayAttributes(IntEnum):
diff --git a/tests/conftest.py b/tests/conftest.py
index 05e01109c..b08c2867c 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,15 +1,11 @@
-import pytest
-
-from mock import Mock
-
 import os
 import sys
 import threading
 import tempfile
-
+import pytest
+from mock import Mock
 from spalloc import ProtocolClient
 from spalloc.config import SEARCH_PATH
-
 from .common import MockServer
 
 
diff --git a/tests/scripts/test_alloc.py b/tests/scripts/test_alloc.py
index 803c0946d..2881d6f49 100644
--- a/tests/scripts/test_alloc.py
+++ b/tests/scripts/test_alloc.py
@@ -1,14 +1,10 @@
-import pytest
-
-from mock import Mock, PropertyMock
-
 import os
 import tempfile
-
+import pytest
+from mock import Mock, PropertyMock
 from spalloc import JobState, JobDestroyedError
-
-from spalloc.scripts.alloc import \
-    write_ips_to_csv, print_info, run_command, main
+from spalloc.scripts.alloc import (
+    write_ips_to_csv, print_info, run_command, main)
 
 
 @pytest.yield_fixture
diff --git a/tests/scripts/test_job_script.py b/tests/scripts/test_job_script.py
index cf7731c9e..08db88f2b 100644
--- a/tests/scripts/test_job_script.py
+++ b/tests/scripts/test_job_script.py
@@ -1,15 +1,12 @@
+import datetime
 import pytest
-
 from mock import Mock, MagicMock
-
-import datetime
-
 from spalloc import JobState, ProtocolError
 from spalloc.term import Terminal
-from spalloc.scripts.job import \
-    show_job_info, watch_job, power_job, list_ips, destroy_job, main
-from spalloc.scripts.support import \
-    VERSION_RANGE_START, VERSION_RANGE_STOP, Terminate
+from spalloc.scripts.job import (
+    show_job_info, watch_job, power_job, list_ips, destroy_job, main)
+from spalloc.scripts.support import (
+    VERSION_RANGE_START, VERSION_RANGE_STOP, Terminate)
 
 
 @pytest.fixture
diff --git a/tests/scripts/test_machine.py b/tests/scripts/test_machine.py
index acc0ec2fa..23355b713 100644
--- a/tests/scripts/test_machine.py
+++ b/tests/scripts/test_machine.py
@@ -1,13 +1,10 @@
 import pytest
-
 from mock import Mock, MagicMock
-
 from spalloc.term import Terminal
-
-from spalloc.scripts.machine import \
-    main, generate_keys, list_machines, show_machine
-from spalloc.scripts.support import \
-    VERSION_RANGE_START, VERSION_RANGE_STOP, Terminate
+from spalloc.scripts.machine import (
+    main, generate_keys, list_machines, show_machine)
+from spalloc.scripts.support import (
+    VERSION_RANGE_START, VERSION_RANGE_STOP, Terminate)
 from spalloc.protocol_client import ProtocolError
 
 
diff --git a/tests/scripts/test_ps.py b/tests/scripts/test_ps.py
index e57eaeddd..2e74e3a2c 100644
--- a/tests/scripts/test_ps.py
+++ b/tests/scripts/test_ps.py
@@ -2,7 +2,6 @@
 import datetime
 from mock import Mock, MagicMock
 import pytest
-
 from spalloc.scripts.ps import main, render_job_list
 from spalloc.scripts.support import VERSION_RANGE_START, VERSION_RANGE_STOP
 from spalloc.term import Terminal
diff --git a/tests/scripts/test_where_is.py b/tests/scripts/test_where_is.py
index d8c9743f9..75cff57a9 100644
--- a/tests/scripts/test_where_is.py
+++ b/tests/scripts/test_where_is.py
@@ -1,7 +1,5 @@
 import pytest
-
 from mock import Mock, MagicMock
-
 from spalloc.scripts.where_is import main
 from spalloc.scripts.support import VERSION_RANGE_START, VERSION_RANGE_STOP
 from spalloc.protocol_client import ProtocolError
diff --git a/tests/test_config.py b/tests/test_config.py
index 630fd5dde..5685d99f0 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -1,9 +1,7 @@
-import pytest
-
 import tempfile
 import shutil
 import os.path
-
+import pytest
 from spalloc.config import read_config
 
 
diff --git a/tests/test_job.py b/tests/test_job.py
index ed209b2a1..0c3902e7d 100644
--- a/tests/test_job.py
+++ b/tests/test_job.py
@@ -1,18 +1,12 @@
+import time
+from threading import Thread, Event
 import pytest
-
 from mock import Mock
-
-import time
-
 from spalloc import Job, JobState, JobDestroyedError, ProtocolTimeoutError
-
 from spalloc._keepalive_process import keep_job_alive
-from spalloc.job import \
-    _JobStateTuple, _JobMachineInfoTuple, \
-    VERSION_RANGE_START, VERSION_RANGE_STOP, \
-    StateChangeTimeoutError
-
-from threading import Thread, Event
+from spalloc.job import (
+    _JobStateTuple, _JobMachineInfoTuple, StateChangeTimeoutError,
+    VERSION_RANGE_START, VERSION_RANGE_STOP)
 
 GOOD_VERSION = ".".join(map(str, VERSION_RANGE_START))
 BAD_VERSION = ".".join(map(str, VERSION_RANGE_STOP))
diff --git a/tests/test_protocol_client.py b/tests/test_protocol_client.py
index 55a891da3..df961e7a4 100644
--- a/tests/test_protocol_client.py
+++ b/tests/test_protocol_client.py
@@ -1,13 +1,12 @@
-import pytest
-from mock import Mock
 import socket
 import threading
 import time
 import logging
-
-from spalloc import ProtocolClient
-from spalloc import SpallocServerException, ProtocolTimeoutError, ProtocolError
-
+import pytest
+from mock import Mock
+from spalloc import (
+    ProtocolClient, SpallocServerException, ProtocolTimeoutError,
+    ProtocolError)
 from .common import MockServer
 
 logging.basicConfig(level=logging.DEBUG)
diff --git a/tests/test_term.py b/tests/test_term.py
index b12da26c0..2b8804fb5 100644
--- a/tests/test_term.py
+++ b/tests/test_term.py
@@ -1,10 +1,8 @@
-import pytest
-
 from collections import OrderedDict
-
-from spalloc.term import \
-    Terminal, render_table, render_definitions, render_boards, render_cells, \
-    DEFAULT_BOARD_EDGES
+import pytest
+from spalloc.term import (
+    Terminal, render_table, render_definitions, render_boards, render_cells,
+    DEFAULT_BOARD_EDGES)
 
 
 @pytest.mark.parametrize("force", [True, False])