diff --git a/pavelib/paver_tests/test_assets.py b/pavelib/paver_tests/test_assets.py
index 2eab46d4bf..bff9a83969 100644
--- a/pavelib/paver_tests/test_assets.py
+++ b/pavelib/paver_tests/test_assets.py
@@ -1,13 +1,14 @@
 """Unit tests for the Paver asset tasks."""
 
 from __future__ import absolute_import
+
 import os
 from unittest import TestCase
 
 import ddt
+import paver.tasks
 from mock import patch
 from paver.easy import call_task, path
-import paver.tasks
 from watchdog.observers import Observer
 
 from pavelib.assets import COLLECTSTATIC_LOG_DIR_ARG, collect_assets
diff --git a/pavelib/paver_tests/test_extract_and_generate.py b/pavelib/paver_tests/test_extract_and_generate.py
index dd5ce43dd0..b94ccb6151 100644
--- a/pavelib/paver_tests/test_extract_and_generate.py
+++ b/pavelib/paver_tests/test_extract_and_generate.py
@@ -2,6 +2,7 @@
 This test tests that i18n extraction (`paver i18n_extract -v`) works properly.
 """
 from __future__ import absolute_import
+
 import os
 import random
 import re
diff --git a/pavelib/paver_tests/test_i18n.py b/pavelib/paver_tests/test_i18n.py
index d0a1289647..c80e1c1f04 100644
--- a/pavelib/paver_tests/test_i18n.py
+++ b/pavelib/paver_tests/test_i18n.py
@@ -3,6 +3,7 @@ Tests for pavelib/i18n.py.
 """
 
 from __future__ import absolute_import
+
 import os
 import textwrap
 import unittest
@@ -14,7 +15,6 @@ import pavelib.i18n
 from pavelib.paver_tests.utils import PaverTestCase
 from pavelib.utils.envs import Env
 
-
 TX_CONFIG_SIMPLE = """\
 [main]
 host = https://www.transifex.com
@@ -32,8 +32,6 @@ source_lang = en
 type = PO
 
 """
-
-# This isn't HTML.
 # xss-lint: disable=python-concat-html
 TX_CONFIG_RELEASE = TX_CONFIG_SIMPLE + """\
 [edx-platform.release-zebrawood]
diff --git a/pavelib/paver_tests/test_js_test.py b/pavelib/paver_tests/test_js_test.py
index 109e91ce93..f7b9730eba 100644
--- a/pavelib/paver_tests/test_js_test.py
+++ b/pavelib/paver_tests/test_js_test.py
@@ -1,6 +1,7 @@
 """Unit tests for the Paver JavaScript testing tasks."""
 
 from __future__ import absolute_import
+
 import ddt
 from mock import patch
 from paver.easy import call_task
diff --git a/pavelib/paver_tests/test_paver_bok_choy_cmds.py b/pavelib/paver_tests/test_paver_bok_choy_cmds.py
index f1f4ffe8f7..69ad257eac 100644
--- a/pavelib/paver_tests/test_paver_bok_choy_cmds.py
+++ b/pavelib/paver_tests/test_paver_bok_choy_cmds.py
@@ -3,6 +3,7 @@ Tests for the bok-choy paver commands themselves.
 Run just this test with: paver test_lib -t pavelib/paver_tests/test_paver_bok_choy_cmds.py
 """
 from __future__ import absolute_import
+
 import os
 import unittest
 from test.test_support import EnvironmentVarGuard
diff --git a/pavelib/paver_tests/test_paver_pytest_cmds.py b/pavelib/paver_tests/test_paver_pytest_cmds.py
index 23ca95fd49..d07ca32164 100644
--- a/pavelib/paver_tests/test_paver_pytest_cmds.py
+++ b/pavelib/paver_tests/test_paver_pytest_cmds.py
@@ -4,13 +4,14 @@ Tests for the pytest paver commands themselves.
 Run just this test with: paver test_lib -t pavelib/paver_tests/test_paver_pytest_cmds.py
 """
 from __future__ import absolute_import
-import unittest
+
 import os
+import unittest
+
 import ddt
 
-from pavelib.utils.test.suites import SystemTestSuite, LibTestSuite
 from pavelib.utils.envs import Env
-
+from pavelib.utils.test.suites import LibTestSuite, SystemTestSuite
 
 XDIST_TESTING_IP_ADDRESS_LIST = '0.0.0.1,0.0.0.2,0.0.0.3'
 
diff --git a/pavelib/paver_tests/test_paver_quality.py b/pavelib/paver_tests/test_paver_quality.py
index 1db4a456cf..44309b5d89 100644
--- a/pavelib/paver_tests/test_paver_quality.py
+++ b/pavelib/paver_tests/test_paver_quality.py
@@ -1,22 +1,21 @@
 """
 Tests for paver quality tasks
 """
-from __future__ import print_function
-from __future__ import absolute_import
+from __future__ import absolute_import, print_function
+
 import os
 import shutil
 import tempfile
 import textwrap
 import unittest
 
-from ddt import ddt, file_data, data, unpack
+from ddt import data, ddt, file_data, unpack
 from mock import MagicMock, mock_open, patch
 from path import Path as path
 from paver.easy import BuildFailure
 
 import pavelib.quality
-from pavelib.paver_tests.utils import fail_on_eslint
-from pavelib.paver_tests.utils import PaverTestCase
+from pavelib.paver_tests.utils import PaverTestCase, fail_on_eslint
 
 
 @ddt
diff --git a/pavelib/paver_tests/test_servers.py b/pavelib/paver_tests/test_servers.py
index 447cd8af05..ef10a6cb06 100644
--- a/pavelib/paver_tests/test_servers.py
+++ b/pavelib/paver_tests/test_servers.py
@@ -1,6 +1,7 @@
 """Unit tests for the Paver server tasks."""
 
 from __future__ import absolute_import
+
 import ddt
 from paver.easy import call_task
 
diff --git a/pavelib/paver_tests/test_stylelint.py b/pavelib/paver_tests/test_stylelint.py
index f8dbd4d7ec..6fab162593 100644
--- a/pavelib/paver_tests/test_stylelint.py
+++ b/pavelib/paver_tests/test_stylelint.py
@@ -2,6 +2,7 @@
 Tests for Paver's Stylelint tasks.
 """
 from __future__ import absolute_import
+
 import ddt
 from mock import MagicMock, patch
 from paver.easy import call_task