diff --git a/magnum/cmd/template_manage.py b/magnum/cmd/template_manage.py
index 3c09c74f82..1354d0dbd1 100644
--- a/magnum/cmd/template_manage.py
+++ b/magnum/cmd/template_manage.py
@@ -17,7 +17,6 @@ import sys
 from cliff import app
 from cliff import commandmanager
 from cliff import lister
-
 from oslo_config import cfg
 
 from magnum.conductor import template_definition as tdef
diff --git a/magnum/common/cert_manager/cert_manager.py b/magnum/common/cert_manager/cert_manager.py
index 1a0ee458d0..639d501e53 100644
--- a/magnum/common/cert_manager/cert_manager.py
+++ b/magnum/common/cert_manager/cert_manager.py
@@ -16,6 +16,7 @@
 Certificate manager API
 """
 import abc
+
 import six
 
 from magnum.common.x509 import operations
diff --git a/magnum/conductor/handlers/bay_conductor.py b/magnum/conductor/handlers/bay_conductor.py
index 73f9038a8a..485fb397a4 100644
--- a/magnum/conductor/handlers/bay_conductor.py
+++ b/magnum/conductor/handlers/bay_conductor.py
@@ -12,7 +12,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import six
 import uuid
 
 from heatclient.common import template_utils
@@ -20,6 +19,7 @@ from heatclient import exc
 from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_service import loopingcall
+import six
 
 from magnum.common import clients
 from magnum.common import exception
diff --git a/magnum/conductor/handlers/docker_conductor.py b/magnum/conductor/handlers/docker_conductor.py
index 41ab910993..869110769a 100644
--- a/magnum/conductor/handlers/docker_conductor.py
+++ b/magnum/conductor/handlers/docker_conductor.py
@@ -11,8 +11,10 @@
 #    limitations under the License.
 
 """Magnum Docker RPC handler."""
-from docker import errors
+
 import functools
+
+from docker import errors
 from oslo_log import log as logging
 import six
 
diff --git a/magnum/objects/container.py b/magnum/objects/container.py
index 7e1a27d0cd..dce5187cda 100644
--- a/magnum/objects/container.py
+++ b/magnum/objects/container.py
@@ -14,7 +14,6 @@ from oslo_versionedobjects import fields
 
 from magnum.db import api as dbapi
 from magnum.objects import base
-
 from magnum.objects import fields as m_fields
 
 
diff --git a/magnum/objects/pod.py b/magnum/objects/pod.py
index 1e82594671..cbdf31a7b1 100644
--- a/magnum/objects/pod.py
+++ b/magnum/objects/pod.py
@@ -10,6 +10,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import ast
+
 from oslo_versionedobjects import fields
 
 from magnum.common import exception
@@ -17,8 +19,6 @@ from magnum.common.pythonk8sclient.swagger_client import rest
 from magnum.db import api as dbapi
 from magnum.objects import base
 
-import ast
-
 
 @base.MagnumObjectRegistry.register
 class Pod(base.MagnumPersistentObject, base.MagnumObject,
diff --git a/magnum/objects/replicationcontroller.py b/magnum/objects/replicationcontroller.py
index cc612b6469..881a8abea9 100644
--- a/magnum/objects/replicationcontroller.py
+++ b/magnum/objects/replicationcontroller.py
@@ -12,6 +12,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import ast
+
 from oslo_versionedobjects import fields
 
 from magnum.common import exception
@@ -19,8 +21,6 @@ from magnum.common.pythonk8sclient.swagger_client import rest
 from magnum.db import api as dbapi
 from magnum.objects import base
 
-import ast
-
 
 @base.MagnumObjectRegistry.register
 class ReplicationController(base.MagnumPersistentObject, base.MagnumObject,
diff --git a/magnum/objects/service.py b/magnum/objects/service.py
index 51cd5295c2..ab53a9a94c 100644
--- a/magnum/objects/service.py
+++ b/magnum/objects/service.py
@@ -10,6 +10,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import ast
+
 from oslo_versionedobjects import fields
 
 from magnum.common import exception
@@ -18,8 +20,6 @@ from magnum.db import api as dbapi
 from magnum.objects import base
 from magnum.objects import fields as magnum_fields
 
-import ast
-
 
 @base.MagnumObjectRegistry.register
 class Service(base.MagnumPersistentObject, base.MagnumObject,
diff --git a/magnum/service/periodic.py b/magnum/service/periodic.py
index e78fb0c2e2..ba4b0b940b 100644
--- a/magnum/service/periodic.py
+++ b/magnum/service/periodic.py
@@ -14,10 +14,10 @@
 # limitations under the License.
 
 import functools
-import six
 
 from oslo_log import log
 from oslo_service import periodic_task
+import six
 
 from magnum.common import clients
 from magnum.common import context
diff --git a/magnum/tests/functional/swarm/test_swarm_python_client.py b/magnum/tests/functional/swarm/test_swarm_python_client.py
index 7aa812fda0..fed15f772f 100644
--- a/magnum/tests/functional/swarm/test_swarm_python_client.py
+++ b/magnum/tests/functional/swarm/test_swarm_python_client.py
@@ -10,9 +10,10 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+import time
+
 from oslo_config import cfg
 from requests import exceptions as req_exceptions
-import time
 
 from magnum.common import docker_utils
 from magnum.tests.functional.python_client_base import BayAPITLSTest
diff --git a/magnum/tests/functional/tempest_tests/config.py b/magnum/tests/functional/tempest_tests/config.py
index ac8d268ac2..b8177fa248 100644
--- a/magnum/tests/functional/tempest_tests/config.py
+++ b/magnum/tests/functional/tempest_tests/config.py
@@ -13,9 +13,9 @@
 from __future__ import print_function
 
 from oslo_config import cfg
-
 from tempest import config  # noqa
 
+
 service_available_group = cfg.OptGroup(name="service_available",
                                        title="Available OpenStack Services")
 
diff --git a/magnum/tests/unit/api/controllers/v1/test_utils.py b/magnum/tests/unit/api/controllers/v1/test_utils.py
index 38c950d286..e49240a0e8 100644
--- a/magnum/tests/unit/api/controllers/v1/test_utils.py
+++ b/magnum/tests/unit/api/controllers/v1/test_utils.py
@@ -15,6 +15,7 @@
 
 import jsonpatch
 import mock
+from oslo_config import cfg
 import wsme
 
 from magnum.api import utils
@@ -22,7 +23,6 @@ from magnum.common import exception
 from magnum.common import utils as common_utils
 from magnum.tests.unit.api import base
 
-from oslo_config import cfg
 
 CONF = cfg.CONF
 
diff --git a/magnum/tests/unit/api/test_servicegroup.py b/magnum/tests/unit/api/test_servicegroup.py
index 0c2c5d5392..6db4a62834 100644
--- a/magnum/tests/unit/api/test_servicegroup.py
+++ b/magnum/tests/unit/api/test_servicegroup.py
@@ -11,10 +11,10 @@
 # limitations under the License.
 
 import datetime
-import mock
-import pytz
 
+import mock
 from oslo_utils import timeutils
+import pytz
 
 from magnum.api import servicegroup as svc_grp
 from magnum.tests.unit.api import base as api_base
diff --git a/magnum/tests/unit/api/utils.py b/magnum/tests/unit/api/utils.py
index 87c62e7f3e..376d6487ff 100644
--- a/magnum/tests/unit/api/utils.py
+++ b/magnum/tests/unit/api/utils.py
@@ -13,6 +13,7 @@
 Utils for testing the API service.
 """
 import datetime
+
 import pytz
 
 from magnum.api.controllers.v1 import bay as bay_controller
diff --git a/magnum/tests/unit/common/cert_manager/test_cert_manager.py b/magnum/tests/unit/common/cert_manager/test_cert_manager.py
index 992ae3ff72..8ebca884e1 100644
--- a/magnum/tests/unit/common/cert_manager/test_cert_manager.py
+++ b/magnum/tests/unit/common/cert_manager/test_cert_manager.py
@@ -11,8 +11,8 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-import mock
 
+import mock
 from oslo_config import fixture
 
 from magnum.common import cert_manager
diff --git a/magnum/tests/unit/common/test_exception.py b/magnum/tests/unit/common/test_exception.py
index 154a2fb87e..43dbaabba9 100644
--- a/magnum/tests/unit/common/test_exception.py
+++ b/magnum/tests/unit/common/test_exception.py
@@ -11,6 +11,7 @@
 # under the License.
 
 import inspect
+
 import mock
 
 from magnum.common import exception
diff --git a/magnum/tests/unit/common/x509/test_operations.py b/magnum/tests/unit/common/x509/test_operations.py
index 471b7a714c..aa6f43bdfe 100644
--- a/magnum/tests/unit/common/x509/test_operations.py
+++ b/magnum/tests/unit/common/x509/test_operations.py
@@ -12,9 +12,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
-
 from cryptography.hazmat.primitives import serialization
+import mock
 
 from magnum.common.x509 import operations
 from magnum.tests import base
diff --git a/magnum/tests/unit/common/x509/test_sign.py b/magnum/tests/unit/common/x509/test_sign.py
index 88b2fd9bd2..2cb1375b7c 100644
--- a/magnum/tests/unit/common/x509/test_sign.py
+++ b/magnum/tests/unit/common/x509/test_sign.py
@@ -12,15 +12,14 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
-import six
-
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives.asymmetric import rsa
 from cryptography.hazmat.primitives import hashes
 from cryptography.hazmat.primitives import serialization
 from cryptography import x509 as c_x509
 from cryptography.x509.oid import NameOID
+import mock
+import six
 
 from magnum.common.x509 import operations
 from magnum.tests import base
diff --git a/magnum/tests/unit/conductor/handlers/test_bay_conductor.py b/magnum/tests/unit/conductor/handlers/test_bay_conductor.py
index e5bceafdce..d09cea9bfc 100644
--- a/magnum/tests/unit/conductor/handlers/test_bay_conductor.py
+++ b/magnum/tests/unit/conductor/handlers/test_bay_conductor.py
@@ -18,6 +18,9 @@ import six
 import uuid
 
 from heatclient import exc
+import mock
+from mock import patch
+from oslo_config import cfg
 from oslo_service import loopingcall
 
 from magnum.common import exception
@@ -28,10 +31,6 @@ from magnum.tests import base
 from magnum.tests.unit.db import base as db_base
 from magnum.tests.unit.db import utils
 
-import mock
-from mock import patch
-from oslo_config import cfg
-
 
 class TestHandler(db_base.DbTestCase):
 
diff --git a/magnum/tests/unit/conductor/handlers/test_ca_conductor.py b/magnum/tests/unit/conductor/handlers/test_ca_conductor.py
index efa189b6dc..f36d861917 100644
--- a/magnum/tests/unit/conductor/handlers/test_ca_conductor.py
+++ b/magnum/tests/unit/conductor/handlers/test_ca_conductor.py
@@ -12,11 +12,11 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+import mock
+
 from magnum.conductor.handlers import ca_conductor
 from magnum.tests import base
 
-import mock
-
 
 class TestSignConductor(base.TestCase):
     def setUp(self):
diff --git a/magnum/tests/unit/conductor/handlers/test_k8s_bay_conductor.py b/magnum/tests/unit/conductor/handlers/test_k8s_bay_conductor.py
index eb990ce4d9..ff42729911 100644
--- a/magnum/tests/unit/conductor/handlers/test_k8s_bay_conductor.py
+++ b/magnum/tests/unit/conductor/handlers/test_k8s_bay_conductor.py
@@ -11,14 +11,15 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-from magnum.conductor.handlers import bay_conductor
-from magnum import objects
-from magnum.tests import base
 
 import mock
 from mock import patch
 from oslo_config import cfg
 
+from magnum.conductor.handlers import bay_conductor
+from magnum import objects
+from magnum.tests import base
+
 
 class TestBayConductorWithK8s(base.TestCase):
     def setUp(self):
diff --git a/magnum/tests/unit/conductor/handlers/test_k8s_conductor.py b/magnum/tests/unit/conductor/handlers/test_k8s_conductor.py
index 918888bdd4..e1b921126b 100644
--- a/magnum/tests/unit/conductor/handlers/test_k8s_conductor.py
+++ b/magnum/tests/unit/conductor/handlers/test_k8s_conductor.py
@@ -12,15 +12,15 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+import mock
+from mock import patch
+
 from magnum.common import exception
 from magnum.common.pythonk8sclient.swagger_client import rest
 from magnum.conductor.handlers import k8s_conductor
 from magnum import objects
 from magnum.tests import base
 
-import mock
-from mock import patch
-
 
 class TestK8sConductor(base.TestCase):
     def setUp(self):
diff --git a/magnum/tests/unit/conductor/handlers/test_mesos_bay_conductor.py b/magnum/tests/unit/conductor/handlers/test_mesos_bay_conductor.py
index e4494d595e..d7b2c835ca 100644
--- a/magnum/tests/unit/conductor/handlers/test_mesos_bay_conductor.py
+++ b/magnum/tests/unit/conductor/handlers/test_mesos_bay_conductor.py
@@ -11,6 +11,9 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
+
+import mock
+from mock import patch
 from oslo_service import loopingcall
 
 from magnum.conductor.handlers import bay_conductor
@@ -18,9 +21,6 @@ from magnum import objects
 from magnum.objects.fields import BayStatus as bay_status
 from magnum.tests import base
 
-import mock
-from mock import patch
-
 
 class TestBayConductorWithMesos(base.TestCase):
     def setUp(self):
diff --git a/magnum/tests/unit/conductor/handlers/test_swarm_bay_conductor.py b/magnum/tests/unit/conductor/handlers/test_swarm_bay_conductor.py
index 63fde57905..5aabd4ac83 100644
--- a/magnum/tests/unit/conductor/handlers/test_swarm_bay_conductor.py
+++ b/magnum/tests/unit/conductor/handlers/test_swarm_bay_conductor.py
@@ -11,6 +11,9 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
+
+import mock
+from mock import patch
 from oslo_service import loopingcall
 
 from magnum.conductor.handlers import bay_conductor
@@ -18,9 +21,6 @@ from magnum import objects
 from magnum.objects.fields import BayStatus as bay_status
 from magnum.tests import base
 
-import mock
-from mock import patch
-
 
 class TestBayConductorWithSwarm(base.TestCase):
     def setUp(self):
diff --git a/magnum/tests/unit/conductor/handlers/test_x509keypair_conductor.py b/magnum/tests/unit/conductor/handlers/test_x509keypair_conductor.py
index 4b674630c3..f0005f4181 100644
--- a/magnum/tests/unit/conductor/handlers/test_x509keypair_conductor.py
+++ b/magnum/tests/unit/conductor/handlers/test_x509keypair_conductor.py
@@ -12,13 +12,13 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+import mock
+from mock import patch
+
 from magnum.conductor.handlers import x509keypair_conductor
 from magnum import objects
 from magnum.tests import base
 
-import mock
-from mock import patch
-
 
 class TestX509KeyPairConductor(base.TestCase):
     def setUp(self):
diff --git a/magnum/tests/unit/conductor/tasks/test_heat_tasks.py b/magnum/tests/unit/conductor/tasks/test_heat_tasks.py
index 55eb31fdf5..973860c9b4 100644
--- a/magnum/tests/unit/conductor/tasks/test_heat_tasks.py
+++ b/magnum/tests/unit/conductor/tasks/test_heat_tasks.py
@@ -12,13 +12,13 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from magnum.conductor.tasks import heat_tasks
-from magnum.tests import base
-
 import mock
 from taskflow import engines
 from taskflow.patterns import linear_flow
 
+from magnum.conductor.tasks import heat_tasks
+from magnum.tests import base
+
 
 class HeatTasksTests(base.TestCase):
 
diff --git a/magnum/tests/unit/conductor/test_monitors.py b/magnum/tests/unit/conductor/test_monitors.py
index b7137e4c5b..fdefd9c8ca 100644
--- a/magnum/tests/unit/conductor/test_monitors.py
+++ b/magnum/tests/unit/conductor/test_monitors.py
@@ -14,7 +14,6 @@
 # limitations under the License.
 
 import mock
-
 from oslo_serialization import jsonutils
 
 from magnum.conductor import k8s_monitor
diff --git a/magnum/tests/unit/objects/test_pod.py b/magnum/tests/unit/objects/test_pod.py
index 01fbd63ce7..aa7ea36a96 100644
--- a/magnum/tests/unit/objects/test_pod.py
+++ b/magnum/tests/unit/objects/test_pod.py
@@ -13,12 +13,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import mock
+
 from magnum import objects
 from magnum.tests.unit.db import base
 from magnum.tests.unit.db import utils
 
-import mock
-
 
 class TestPodObject(base.DbTestCase):
 
diff --git a/magnum/tests/unit/objects/test_replicationcontroller.py b/magnum/tests/unit/objects/test_replicationcontroller.py
index d57150f848..97b6d0918e 100644
--- a/magnum/tests/unit/objects/test_replicationcontroller.py
+++ b/magnum/tests/unit/objects/test_replicationcontroller.py
@@ -13,12 +13,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import mock
+
 from magnum import objects
 from magnum.tests.unit.db import base
 from magnum.tests.unit.db import utils
 
-import mock
-
 
 class TestReplicationControllerObject(base.DbTestCase):
 
diff --git a/magnum/tests/unit/objects/test_service.py b/magnum/tests/unit/objects/test_service.py
index 23b1220851..436167003b 100644
--- a/magnum/tests/unit/objects/test_service.py
+++ b/magnum/tests/unit/objects/test_service.py
@@ -13,12 +13,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import mock
+
 from magnum import objects
 from magnum.tests.unit.db import base
 from magnum.tests.unit.db import utils
 
-import mock
-
 
 class TestServiceObject(base.DbTestCase):
 
diff --git a/magnum/tests/unit/test_hacking.py b/magnum/tests/unit/test_hacking.py
index 9efeb574cc..e064b959d2 100644
--- a/magnum/tests/unit/test_hacking.py
+++ b/magnum/tests/unit/test_hacking.py
@@ -12,9 +12,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import textwrap
+
 import mock
 import pep8
-import textwrap
 
 from magnum.hacking import checks
 from magnum.tests import base