diff --git a/pavelib/paver_tests/test_paver_get_quality_reports.py b/pavelib/paver_tests/test_paver_get_quality_reports.py
index 632031e661..a92b0b9d0b 100644
--- a/pavelib/paver_tests/test_paver_get_quality_reports.py
+++ b/pavelib/paver_tests/test_paver_get_quality_reports.py
@@ -2,6 +2,7 @@
 Tests to ensure only the report files we want are returned as part of run_quality.
 """
 from __future__ import absolute_import
+
 import unittest
 
 from mock import patch
diff --git a/pavelib/paver_tests/test_pii_check.py b/pavelib/paver_tests/test_pii_check.py
index d85edbf8e5..d35d30068f 100644
--- a/pavelib/paver_tests/test_pii_check.py
+++ b/pavelib/paver_tests/test_pii_check.py
@@ -2,13 +2,15 @@
 Tests for Paver's PII checker task.
 """
 from __future__ import absolute_import
+
 import io
+
 import six
 from mock import patch
 from paver.easy import call_task
-from pavelib.utils.envs import Env
 
 import pavelib.quality
+from pavelib.utils.envs import Env
 
 
 @patch.object(pavelib.quality.run_pii_check, 'needs')
diff --git a/pavelib/paver_tests/test_utils.py b/pavelib/paver_tests/test_utils.py
index 814a9b4af7..1aa846a412 100644
--- a/pavelib/paver_tests/test_utils.py
+++ b/pavelib/paver_tests/test_utils.py
@@ -3,6 +3,7 @@ Tests for pavelib/utils/test/utils
 """
 
 from __future__ import absolute_import
+
 import unittest
 
 from mock import patch
diff --git a/pavelib/paver_tests/test_xsscommitlint.py b/pavelib/paver_tests/test_xsscommitlint.py
index fcdfe3f0ba..e8e2e15038 100644
--- a/pavelib/paver_tests/test_xsscommitlint.py
+++ b/pavelib/paver_tests/test_xsscommitlint.py
@@ -2,6 +2,7 @@
 Tests for paver xsscommitlint quality tasks
 """
 from __future__ import absolute_import
+
 from mock import patch
 from paver.easy import call_task
 
diff --git a/pavelib/paver_tests/test_xsslint.py b/pavelib/paver_tests/test_xsslint.py
index 3a6d7d8bbb..634d479871 100644
--- a/pavelib/paver_tests/test_xsslint.py
+++ b/pavelib/paver_tests/test_xsslint.py
@@ -2,6 +2,7 @@
 Tests for paver xsslint quality tasks
 """
 from __future__ import absolute_import
+
 from mock import patch
 from paver.easy import call_task
 
diff --git a/pavelib/paver_tests/utils.py b/pavelib/paver_tests/utils.py
index c9ef27cf0c..a318e4668c 100644
--- a/pavelib/paver_tests/utils.py
+++ b/pavelib/paver_tests/utils.py
@@ -1,13 +1,14 @@
 """Unit tests for the Paver server tasks."""
 
 from __future__ import absolute_import
+
 import os
 from unittest import TestCase
 from uuid import uuid4
 
+import six
 from paver import tasks
 from paver.easy import BuildFailure
-import six
 
 
 class PaverTestCase(TestCase):
diff --git a/pavelib/utils/db_utils.py b/pavelib/utils/db_utils.py
index 280e398890..09daf1511b 100644
--- a/pavelib/utils/db_utils.py
+++ b/pavelib/utils/db_utils.py
@@ -1,8 +1,8 @@
 """
 Utility methods for bokchoy database manipulation.
 """
-from __future__ import print_function
-from __future__ import absolute_import
+from __future__ import absolute_import, print_function
+
 import os
 import tarfile
 
diff --git a/pavelib/utils/timer.py b/pavelib/utils/timer.py
index d74ed393c4..dd65768574 100644
--- a/pavelib/utils/timer.py
+++ b/pavelib/utils/timer.py
@@ -3,6 +3,7 @@ Tools for timing paver tasks
 """
 
 from __future__ import absolute_import
+
 import json
 import logging
 import os