diff --git a/almanach/core/controllers/base_controller.py b/almanach/core/controllers/base_controller.py
index a198c46..6a85aac 100644
--- a/almanach/core/controllers/base_controller.py
+++ b/almanach/core/controllers/base_controller.py
@@ -14,9 +14,10 @@
 
 import abc
 from dateutil import parser as date_parser
+import six
+
 from oslo_log import log
 import pytz
-import six
 
 from almanach.core import exception
 
diff --git a/almanach/core/controllers/entity_controller.py b/almanach/core/controllers/entity_controller.py
index 2b56665..3e91f4d 100644
--- a/almanach/core/controllers/entity_controller.py
+++ b/almanach/core/controllers/entity_controller.py
@@ -11,11 +11,12 @@
 # WITHOUT 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 almanach.validators import instance_validator
+
 from oslo_log import log
 
 from almanach.core.controllers import base_controller
 from almanach.core import exception
+from almanach.validators import instance_validator
 
 LOG = log.getLogger(__name__)
 
diff --git a/almanach/core/controllers/volume_controller.py b/almanach/core/controllers/volume_controller.py
index e93d16e..ff235dd 100644
--- a/almanach/core/controllers/volume_controller.py
+++ b/almanach/core/controllers/volume_controller.py
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 from datetime import timedelta
+
 from oslo_log import log
 
 from almanach.core.controllers import base_controller
diff --git a/almanach/tests/tempest/plugin.py b/almanach/tests/tempest/plugin.py
index 43b132f..fda9884 100644
--- a/almanach/tests/tempest/plugin.py
+++ b/almanach/tests/tempest/plugin.py
@@ -12,12 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import almanach
 import os
 
 from tempest import config
 from tempest.test_discover import plugins
 
+import almanach
 from almanach.tests.tempest import config as project_config
 
 
diff --git a/almanach/tests/tempest/tests/api/base.py b/almanach/tests/tempest/tests/api/base.py
index 8f99adb..e1add09 100644
--- a/almanach/tests/tempest/tests/api/base.py
+++ b/almanach/tests/tempest/tests/api/base.py
@@ -12,11 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from uuid import uuid4
+
 from oslo_serialization import jsonutils as json
 from tempest.common.utils import data_utils
 from tempest import config
 import tempest.test
-from uuid import uuid4
 
 from almanach.tests.tempest import clients
 
diff --git a/almanach/tests/tempest/tests/api/test_server_creation.py b/almanach/tests/tempest/tests/api/test_server_creation.py
index 6c0128e..10c47ab 100644
--- a/almanach/tests/tempest/tests/api/test_server_creation.py
+++ b/almanach/tests/tempest/tests/api/test_server_creation.py
@@ -12,9 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from uuid import uuid4
+
 from oslo_serialization import jsonutils as json
 from tempest.lib import exceptions
-from uuid import uuid4
 
 from almanach.tests.tempest.tests.api import base
 
diff --git a/almanach/tests/tempest/tests/api/test_server_deletion.py b/almanach/tests/tempest/tests/api/test_server_deletion.py
index 02783d8..2517941 100644
--- a/almanach/tests/tempest/tests/api/test_server_deletion.py
+++ b/almanach/tests/tempest/tests/api/test_server_deletion.py
@@ -12,9 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo_serialization import jsonutils as json
 from uuid import uuid4
 
+from oslo_serialization import jsonutils as json
+
 from almanach.tests.tempest.tests.api import base
 
 
diff --git a/almanach/tests/tempest/tests/api/test_server_rebuild.py b/almanach/tests/tempest/tests/api/test_server_rebuild.py
index e8e8547..bce15f6 100644
--- a/almanach/tests/tempest/tests/api/test_server_rebuild.py
+++ b/almanach/tests/tempest/tests/api/test_server_rebuild.py
@@ -12,9 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo_serialization import jsonutils as json
 from uuid import uuid4
 
+from oslo_serialization import jsonutils as json
+
 from almanach.tests.tempest.tests.api import base
 
 
diff --git a/almanach/tests/tempest/tests/api/test_server_resize.py b/almanach/tests/tempest/tests/api/test_server_resize.py
index dd210eb..fb2df56 100644
--- a/almanach/tests/tempest/tests/api/test_server_resize.py
+++ b/almanach/tests/tempest/tests/api/test_server_resize.py
@@ -12,9 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo_serialization import jsonutils as json
 from uuid import uuid4
 
+from oslo_serialization import jsonutils as json
+
 from almanach.tests.tempest.tests.api import base
 
 
diff --git a/almanach/tests/tempest/tests/api/test_server_update.py b/almanach/tests/tempest/tests/api/test_server_update.py
index 2c288d3..8eafaa1 100644
--- a/almanach/tests/tempest/tests/api/test_server_update.py
+++ b/almanach/tests/tempest/tests/api/test_server_update.py
@@ -12,9 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo_serialization import jsonutils as json
 from uuid import uuid4
 
+from oslo_serialization import jsonutils as json
+
 from almanach.tests.tempest.tests.api import base
 
 
diff --git a/almanach/tests/tempest/tests/api/test_volume_attach.py b/almanach/tests/tempest/tests/api/test_volume_attach.py
index c2dd3f4..cccb1b8 100644
--- a/almanach/tests/tempest/tests/api/test_volume_attach.py
+++ b/almanach/tests/tempest/tests/api/test_volume_attach.py
@@ -12,9 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo_serialization import jsonutils as json
 from uuid import uuid4
 
+from oslo_serialization import jsonutils as json
+
 from almanach.tests.tempest.tests.api import base
 
 
diff --git a/almanach/tests/tempest/tests/api/test_volume_detach.py b/almanach/tests/tempest/tests/api/test_volume_detach.py
index 2220560..67297db 100644
--- a/almanach/tests/tempest/tests/api/test_volume_detach.py
+++ b/almanach/tests/tempest/tests/api/test_volume_detach.py
@@ -12,9 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo_serialization import jsonutils as json
 from uuid import uuid4
 
+from oslo_serialization import jsonutils as json
+
 from almanach.tests.tempest.tests.api import base
 
 
diff --git a/almanach/tests/tempest/tests/scenario/base.py b/almanach/tests/tempest/tests/scenario/base.py
index 3ef1f15..fb13a01 100644
--- a/almanach/tests/tempest/tests/scenario/base.py
+++ b/almanach/tests/tempest/tests/scenario/base.py
@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import time
+
 from oslo_serialization import jsonutils as json
 from tempest.common import compute
 from tempest.common.utils import data_utils
@@ -19,8 +21,6 @@ from tempest.common import waiters
 from tempest import config
 from tempest.lib import exceptions
 from tempest.scenario import manager
-import time
-
 
 from almanach.tests.tempest import clients
 
diff --git a/almanach/tests/unit/api/auth/test_keystone_auth.py b/almanach/tests/unit/api/auth/test_keystone_auth.py
index 3b32fdc..42010cd 100644
--- a/almanach/tests/unit/api/auth/test_keystone_auth.py
+++ b/almanach/tests/unit/api/auth/test_keystone_auth.py
@@ -12,9 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from keystoneauth1 import exceptions as keystoneauth1_exceptions
 import mock
 
+from keystoneauth1 import exceptions as keystoneauth1_exceptions
+
 from almanach.api.auth import keystone_auth
 from almanach.core import exception
 from almanach.tests.unit import base
diff --git a/almanach/tests/unit/api/v1/base_api.py b/almanach/tests/unit/api/v1/base_api.py
index 54c346f..ef9a2eb 100644
--- a/almanach/tests/unit/api/v1/base_api.py
+++ b/almanach/tests/unit/api/v1/base_api.py
@@ -13,8 +13,9 @@
 # limitations under the License.
 
 from datetime import datetime
-import flask
 from mock import mock
+
+import flask
 from oslo_serialization import jsonutils as json
 
 from almanach.api.v1 import routes
diff --git a/almanach/tests/unit/builders/entity.py b/almanach/tests/unit/builders/entity.py
index 86659db..1f50a35 100644
--- a/almanach/tests/unit/builders/entity.py
+++ b/almanach/tests/unit/builders/entity.py
@@ -14,9 +14,10 @@
 
 from copy import copy
 from datetime import datetime
-import pytz
 from uuid import uuid4
 
+import pytz
+
 from almanach.core import model
 
 
diff --git a/almanach/tests/unit/collector/test_messaging.py b/almanach/tests/unit/collector/test_messaging.py
index 3cc3bb9..380887d 100644
--- a/almanach/tests/unit/collector/test_messaging.py
+++ b/almanach/tests/unit/collector/test_messaging.py
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import mock
+
 import oslo_messaging
 
 from almanach.collector import messaging
diff --git a/almanach/tests/unit/collector/test_service.py b/almanach/tests/unit/collector/test_service.py
index d674a9b..9a9ea28 100644
--- a/almanach/tests/unit/collector/test_service.py
+++ b/almanach/tests/unit/collector/test_service.py
@@ -12,9 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from almanach.collector import service
 import mock
 
+from almanach.collector import service
 from almanach.tests.unit import base
 
 
diff --git a/almanach/tests/unit/core/controllers/test_application_controller.py b/almanach/tests/unit/core/controllers/test_application_controller.py
index 1e4172b..7f4870f 100644
--- a/almanach/tests/unit/core/controllers/test_application_controller.py
+++ b/almanach/tests/unit/core/controllers/test_application_controller.py
@@ -12,9 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from almanach.core.controllers import application_controller
 import mock
 
+from almanach.core.controllers import application_controller
 from almanach.tests.unit import base
 
 
diff --git a/almanach/tests/unit/core/controllers/test_volume_type_controller.py b/almanach/tests/unit/core/controllers/test_volume_type_controller.py
index bcebe32..dbc6c47 100644
--- a/almanach/tests/unit/core/controllers/test_volume_type_controller.py
+++ b/almanach/tests/unit/core/controllers/test_volume_type_controller.py
@@ -12,9 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from almanach.core.controllers import volume_type_controller
 import mock
 
+from almanach.core.controllers import volume_type_controller
+
 from almanach.tests.unit import base
 from almanach.tests.unit.builders.entity import a
 from almanach.tests.unit.builders.entity import volume_type
diff --git a/almanach/tests/unit/core/test_factory.py b/almanach/tests/unit/core/test_factory.py
index b38eac1..e92e5b0 100644
--- a/almanach/tests/unit/core/test_factory.py
+++ b/almanach/tests/unit/core/test_factory.py
@@ -12,13 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import mock
+
 from almanach.core.controllers import application_controller
 from almanach.core.controllers import entity_controller
 from almanach.core.controllers import instance_controller
 from almanach.core.controllers import volume_controller
 from almanach.core.controllers import volume_type_controller
 from almanach.core import factory
-import mock
 
 from almanach.tests.unit import base
 
diff --git a/almanach/tests/unit/core/test_model.py b/almanach/tests/unit/core/test_model.py
index 2d202ab..4f49f60 100644
--- a/almanach/tests/unit/core/test_model.py
+++ b/almanach/tests/unit/core/test_model.py
@@ -12,10 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from datetime import datetime
+
+import pytz
+
 from almanach.core import exception
 from almanach.core import model
-from datetime import datetime
-import pytz
 
 from almanach.tests.unit import base
 
diff --git a/almanach/tests/unit/storage/drivers/test_mongodb_driver.py b/almanach/tests/unit/storage/drivers/test_mongodb_driver.py
index efcfdd7..e01a3bc 100644
--- a/almanach/tests/unit/storage/drivers/test_mongodb_driver.py
+++ b/almanach/tests/unit/storage/drivers/test_mongodb_driver.py
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 from datetime import datetime
+
 import mongomock
 import pytz