diff --git a/cinderclient/api_versions.py b/cinderclient/api_versions.py
index 33ba5087d..bf8cba222 100644
--- a/cinderclient/api_versions.py
+++ b/cinderclient/api_versions.py
@@ -19,9 +19,9 @@ import re
 
 from oslo_utils import strutils
 
+from cinderclient._i18n import _
 from cinderclient import exceptions
 from cinderclient import utils
-from cinderclient._i18n import _
 
 LOG = logging.getLogger(__name__)
 
diff --git a/cinderclient/client.py b/cinderclient/client.py
index 6537cfe73..e5fe90fe6 100644
--- a/cinderclient/client.py
+++ b/cinderclient/client.py
@@ -32,8 +32,8 @@ import six
 
 from keystoneauth1 import access
 from keystoneauth1 import adapter
-from keystoneauth1.identity import base
 from keystoneauth1 import discover
+from keystoneauth1.identity import base
 from oslo_utils import encodeutils
 from oslo_utils import importutils
 from oslo_utils import strutils
@@ -42,10 +42,10 @@ import requests
 from six.moves import urllib
 import six.moves.urllib.parse as urlparse
 
+from cinderclient._i18n import _
 from cinderclient import api_versions
 from cinderclient import exceptions
 import cinderclient.extension
-from cinderclient._i18n import _
 
 try:
     from eventlet import sleep
diff --git a/cinderclient/shell.py b/cinderclient/shell.py
index 536ec3c0a..8e8868569 100644
--- a/cinderclient/shell.py
+++ b/cinderclient/shell.py
@@ -44,6 +44,8 @@ from cinderclient import api_versions
 from cinderclient import client
 from cinderclient import exceptions as exc
 from cinderclient import utils
+
+
 # Enable i18n lazy translation
 _i18n.enable_lazy()
 
diff --git a/cinderclient/shell_utils.py b/cinderclient/shell_utils.py
index 601bcdc69..995f2165c 100644
--- a/cinderclient/shell_utils.py
+++ b/cinderclient/shell_utils.py
@@ -17,8 +17,8 @@ from __future__ import print_function
 import sys
 import time
 
-from cinderclient import utils
 from cinderclient import exceptions
+from cinderclient import utils
 
 _quota_resources = ['volumes', 'snapshots', 'gigabytes',
                     'backups', 'backup_gigabytes',
diff --git a/cinderclient/tests/functional/test_volume_create_cli.py b/cinderclient/tests/functional/test_volume_create_cli.py
index da4d5fb9a..c93a31b6f 100644
--- a/cinderclient/tests/functional/test_volume_create_cli.py
+++ b/cinderclient/tests/functional/test_volume_create_cli.py
@@ -12,8 +12,8 @@
 
 import unittest
 
-import six
 import ddt
+import six
 
 from tempest.lib import exceptions
 
diff --git a/cinderclient/tests/functional/test_volume_extend_cli.py b/cinderclient/tests/functional/test_volume_extend_cli.py
index f08c875c5..4fa9d73b2 100644
--- a/cinderclient/tests/functional/test_volume_extend_cli.py
+++ b/cinderclient/tests/functional/test_volume_extend_cli.py
@@ -10,8 +10,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import six
 import ddt
+import six
 
 from tempest.lib import exceptions
 
diff --git a/cinderclient/tests/unit/fixture_data/availability_zones.py b/cinderclient/tests/unit/fixture_data/availability_zones.py
index f1140a79f..6f197ce0a 100644
--- a/cinderclient/tests/unit/fixture_data/availability_zones.py
+++ b/cinderclient/tests/unit/fixture_data/availability_zones.py
@@ -11,6 +11,7 @@
 # under the License.
 
 from datetime import datetime
+
 from cinderclient.tests.unit.fixture_data import base
 
 # FIXME(jamielennox): use timeutils from oslo
diff --git a/cinderclient/tests/unit/test_api_versions.py b/cinderclient/tests/unit/test_api_versions.py
index 5f14c3e9c..24b09d0c4 100644
--- a/cinderclient/tests/unit/test_api_versions.py
+++ b/cinderclient/tests/unit/test_api_versions.py
@@ -21,8 +21,9 @@ from cinderclient import api_versions
 from cinderclient import client as base_client
 from cinderclient import exceptions
 from cinderclient.v3 import client
-from cinderclient.tests.unit import utils
+
 from cinderclient.tests.unit import test_utils
+from cinderclient.tests.unit import utils
 
 
 @ddt.ddt
diff --git a/cinderclient/tests/unit/test_base.py b/cinderclient/tests/unit/test_base.py
index d4dd517ce..99bb29ea5 100644
--- a/cinderclient/tests/unit/test_base.py
+++ b/cinderclient/tests/unit/test_base.py
@@ -19,11 +19,12 @@ import six
 from cinderclient import api_versions
 from cinderclient.apiclient import base as common_base
 from cinderclient import base
-from cinderclient.v3 import client
 from cinderclient import exceptions
+from cinderclient.v3 import client
 from cinderclient.v3 import volumes
-from cinderclient.tests.unit import utils
+
 from cinderclient.tests.unit import test_utils
+from cinderclient.tests.unit import utils
 from cinderclient.tests.unit.v1 import fakes
 
 
diff --git a/cinderclient/tests/unit/test_client.py b/cinderclient/tests/unit/test_client.py
index 569703994..4b341b23e 100644
--- a/cinderclient/tests/unit/test_client.py
+++ b/cinderclient/tests/unit/test_client.py
@@ -22,12 +22,13 @@ import mock
 from oslo_serialization import jsonutils
 import six
 
-import cinderclient.client
-import cinderclient.v1.client
-import cinderclient.v2.client
 from cinderclient import api_versions
+import cinderclient.client
 from cinderclient import exceptions
 from cinderclient import utils
+import cinderclient.v1.client
+import cinderclient.v2.client
+
 from cinderclient.tests.unit import utils
 from cinderclient.tests.unit.v3 import fakes
 
diff --git a/cinderclient/tests/unit/test_utils.py b/cinderclient/tests/unit/test_utils.py
index 7f39f06f5..2847d2c80 100644
--- a/cinderclient/tests/unit/test_utils.py
+++ b/cinderclient/tests/unit/test_utils.py
@@ -16,15 +16,16 @@ import ddt
 import sys
 
 import mock
-from six import moves
 import six
+from six import moves
 
 from cinderclient import api_versions
 from cinderclient.apiclient import base as common_base
+from cinderclient import base
 from cinderclient import exceptions
 from cinderclient import shell_utils
 from cinderclient import utils
-from cinderclient import base
+
 from cinderclient.tests.unit import utils as test_utils
 from cinderclient.tests.unit.v2 import fakes
 
diff --git a/cinderclient/tests/unit/v1/test_auth.py b/cinderclient/tests/unit/v1/test_auth.py
index 7e5b90170..29f8cc390 100644
--- a/cinderclient/tests/unit/v1/test_auth.py
+++ b/cinderclient/tests/unit/v1/test_auth.py
@@ -16,8 +16,9 @@ import mock
 
 import requests
 
-from cinderclient.v1 import client
 from cinderclient import exceptions
+from cinderclient.v1 import client
+
 from cinderclient.tests.unit import utils
 
 
diff --git a/cinderclient/tests/unit/v1/test_availability_zone.py b/cinderclient/tests/unit/v1/test_availability_zone.py
index 667b89f2f..7e4c439ce 100644
--- a/cinderclient/tests/unit/v1/test_availability_zone.py
+++ b/cinderclient/tests/unit/v1/test_availability_zone.py
@@ -18,8 +18,9 @@ import six
 
 from cinderclient.v1 import availability_zones
 from cinderclient.v1 import shell
-from cinderclient.tests.unit.fixture_data import client
+
 from cinderclient.tests.unit.fixture_data import availability_zones as azfixture  # noqa
+from cinderclient.tests.unit.fixture_data import client
 from cinderclient.tests.unit import utils
 
 
diff --git a/cinderclient/tests/unit/v1/test_shell.py b/cinderclient/tests/unit/v1/test_shell.py
index 7aa004530..3f4d7716e 100644
--- a/cinderclient/tests/unit/v1/test_shell.py
+++ b/cinderclient/tests/unit/v1/test_shell.py
@@ -23,9 +23,10 @@ from cinderclient import client
 from cinderclient import exceptions
 from cinderclient import shell
 from cinderclient.v1 import shell as shell_v1
-from cinderclient.tests.unit.v1 import fakes
-from cinderclient.tests.unit import utils
+
 from cinderclient.tests.unit.fixture_data import keystone_client
+from cinderclient.tests.unit import utils
+from cinderclient.tests.unit.v1 import fakes
 
 
 @mock.patch.object(client, 'Client', fakes.FakeClient)
diff --git a/cinderclient/tests/unit/v1/test_snapshot_actions.py b/cinderclient/tests/unit/v1/test_snapshot_actions.py
index 46d31b2a4..2b0402883 100644
--- a/cinderclient/tests/unit/v1/test_snapshot_actions.py
+++ b/cinderclient/tests/unit/v1/test_snapshot_actions.py
@@ -13,9 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from cinderclient.tests.unit import utils
 from cinderclient.tests.unit.fixture_data import client
 from cinderclient.tests.unit.fixture_data import snapshots
+from cinderclient.tests.unit import utils
 
 
 class SnapshotActionsTest(utils.FixturedTestCase):
diff --git a/cinderclient/tests/unit/v1/test_types.py b/cinderclient/tests/unit/v1/test_types.py
index 4c799ece1..6f1b0c29e 100644
--- a/cinderclient/tests/unit/v1/test_types.py
+++ b/cinderclient/tests/unit/v1/test_types.py
@@ -12,6 +12,7 @@
 # limitations under the License.
 
 from cinderclient.v1 import volume_types
+
 from cinderclient.tests.unit import utils
 from cinderclient.tests.unit.v1 import fakes
 
diff --git a/cinderclient/tests/unit/v1/test_volume_encryption_types.py b/cinderclient/tests/unit/v1/test_volume_encryption_types.py
index e6fad933d..48554b07f 100644
--- a/cinderclient/tests/unit/v1/test_volume_encryption_types.py
+++ b/cinderclient/tests/unit/v1/test_volume_encryption_types.py
@@ -14,6 +14,7 @@
 #    under the License.
 
 from cinderclient.v1.volume_encryption_types import VolumeEncryptionType
+
 from cinderclient.tests.unit import utils
 from cinderclient.tests.unit.v1 import fakes
 
diff --git a/cinderclient/tests/unit/v2/contrib/test_list_extensions.py b/cinderclient/tests/unit/v2/contrib/test_list_extensions.py
index 03f35461b..4603bca5f 100644
--- a/cinderclient/tests/unit/v2/contrib/test_list_extensions.py
+++ b/cinderclient/tests/unit/v2/contrib/test_list_extensions.py
@@ -16,6 +16,7 @@
 
 from cinderclient import extension
 from cinderclient.v2.contrib import list_extensions
+
 from cinderclient.tests.unit import utils
 from cinderclient.tests.unit.v1 import fakes
 
diff --git a/cinderclient/tests/unit/v2/test_auth.py b/cinderclient/tests/unit/v2/test_auth.py
index 4caf2eb1e..50c72a301 100644
--- a/cinderclient/tests/unit/v2/test_auth.py
+++ b/cinderclient/tests/unit/v2/test_auth.py
@@ -21,6 +21,7 @@ import requests
 
 from cinderclient import exceptions
 from cinderclient.v2 import client
+
 from cinderclient.tests.unit import utils
 
 
diff --git a/cinderclient/tests/unit/v2/test_availability_zone.py b/cinderclient/tests/unit/v2/test_availability_zone.py
index ea4c2efad..8c2e1ebd8 100644
--- a/cinderclient/tests/unit/v2/test_availability_zone.py
+++ b/cinderclient/tests/unit/v2/test_availability_zone.py
@@ -18,8 +18,9 @@ import six
 
 from cinderclient.v2 import availability_zones
 from cinderclient.v2 import shell
-from cinderclient.tests.unit.fixture_data import client
+
 from cinderclient.tests.unit.fixture_data import availability_zones as azfixture  # noqa
+from cinderclient.tests.unit.fixture_data import client
 from cinderclient.tests.unit import utils
 
 
diff --git a/cinderclient/tests/unit/v2/test_capabilities.py b/cinderclient/tests/unit/v2/test_capabilities.py
index be6aecd7d..0437cc0f2 100644
--- a/cinderclient/tests/unit/v2/test_capabilities.py
+++ b/cinderclient/tests/unit/v2/test_capabilities.py
@@ -14,6 +14,7 @@
 #    under the License.
 
 from cinderclient.v2.capabilities import Capabilities
+
 from cinderclient.tests.unit import utils
 from cinderclient.tests.unit.v2 import fakes
 
diff --git a/cinderclient/tests/unit/v2/test_pools.py b/cinderclient/tests/unit/v2/test_pools.py
index 9ab90493e..543e31674 100644
--- a/cinderclient/tests/unit/v2/test_pools.py
+++ b/cinderclient/tests/unit/v2/test_pools.py
@@ -14,6 +14,7 @@
 #    under the License.
 
 from cinderclient.v2.pools import Pool
+
 from cinderclient.tests.unit import utils
 from cinderclient.tests.unit.v2 import fakes
 
diff --git a/cinderclient/tests/unit/v2/test_shell.py b/cinderclient/tests/unit/v2/test_shell.py
index 888631189..d692f52b9 100644
--- a/cinderclient/tests/unit/v2/test_shell.py
+++ b/cinderclient/tests/unit/v2/test_shell.py
@@ -13,21 +13,22 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import ddt
 import fixtures
 import mock
-import ddt
 from requests_mock.contrib import fixture as requests_mock_fixture
 from six.moves.urllib import parse
 
 from cinderclient import client
 from cinderclient import exceptions
 from cinderclient import shell
-from cinderclient.v2 import volumes
-from cinderclient.v2 import volume_backups
 from cinderclient.v2 import shell as test_shell
+from cinderclient.v2 import volume_backups
+from cinderclient.v2 import volumes
+
+from cinderclient.tests.unit.fixture_data import keystone_client
 from cinderclient.tests.unit import utils
 from cinderclient.tests.unit.v2 import fakes
-from cinderclient.tests.unit.fixture_data import keystone_client
 
 
 @ddt.ddt
diff --git a/cinderclient/tests/unit/v2/test_snapshot_actions.py b/cinderclient/tests/unit/v2/test_snapshot_actions.py
index 5fa3bd4f7..61fd0d06d 100644
--- a/cinderclient/tests/unit/v2/test_snapshot_actions.py
+++ b/cinderclient/tests/unit/v2/test_snapshot_actions.py
@@ -13,9 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from cinderclient.tests.unit import utils
 from cinderclient.tests.unit.fixture_data import client
 from cinderclient.tests.unit.fixture_data import snapshots
+from cinderclient.tests.unit import utils
 
 
 class SnapshotActionsTest(utils.FixturedTestCase):
diff --git a/cinderclient/tests/unit/v2/test_type_access.py b/cinderclient/tests/unit/v2/test_type_access.py
index 99a859ce4..35a4480a7 100644
--- a/cinderclient/tests/unit/v2/test_type_access.py
+++ b/cinderclient/tests/unit/v2/test_type_access.py
@@ -15,6 +15,7 @@
 #    under the License.
 
 from cinderclient.v2 import volume_type_access
+
 from cinderclient.tests.unit import utils
 from cinderclient.tests.unit.v2 import fakes
 
diff --git a/cinderclient/tests/unit/v2/test_types.py b/cinderclient/tests/unit/v2/test_types.py
index 0cb8981f4..9ba13a9c0 100644
--- a/cinderclient/tests/unit/v2/test_types.py
+++ b/cinderclient/tests/unit/v2/test_types.py
@@ -15,6 +15,7 @@
 #    under the License.
 
 from cinderclient.v2 import volume_types
+
 from cinderclient.tests.unit import utils
 from cinderclient.tests.unit.v2 import fakes
 
diff --git a/cinderclient/tests/unit/v2/test_volume_encryption_types.py b/cinderclient/tests/unit/v2/test_volume_encryption_types.py
index 193fad81f..1bbf537a1 100644
--- a/cinderclient/tests/unit/v2/test_volume_encryption_types.py
+++ b/cinderclient/tests/unit/v2/test_volume_encryption_types.py
@@ -13,9 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from cinderclient.v2.volume_encryption_types import VolumeEncryptionType
 from cinderclient.tests.unit import utils
 from cinderclient.tests.unit.v2 import fakes
+from cinderclient.v2.volume_encryption_types import VolumeEncryptionType
 
 cs = fakes.FakeClient()
 
diff --git a/cinderclient/tests/unit/v3/fakes.py b/cinderclient/tests/unit/v3/fakes.py
index 04c5aa077..da240f3aa 100644
--- a/cinderclient/tests/unit/v3/fakes.py
+++ b/cinderclient/tests/unit/v3/fakes.py
@@ -14,8 +14,9 @@
 
 from datetime import datetime
 
-from cinderclient.tests.unit import fakes
 from cinderclient.v3 import client
+
+from cinderclient.tests.unit import fakes
 from cinderclient.tests.unit.v2 import fakes as fake_v2
 
 
diff --git a/cinderclient/tests/unit/v3/test_group_types.py b/cinderclient/tests/unit/v3/test_group_types.py
index 7918bf11d..5833c3fc2 100644
--- a/cinderclient/tests/unit/v3/test_group_types.py
+++ b/cinderclient/tests/unit/v3/test_group_types.py
@@ -17,6 +17,7 @@
 from cinderclient import api_versions
 from cinderclient import exceptions as exc
 from cinderclient.v3 import group_types
+
 from cinderclient.tests.unit import utils
 from cinderclient.tests.unit.v3 import fakes
 
diff --git a/cinderclient/tests/unit/v3/test_services.py b/cinderclient/tests/unit/v3/test_services.py
index 92f7903a5..14d89405f 100644
--- a/cinderclient/tests/unit/v3/test_services.py
+++ b/cinderclient/tests/unit/v3/test_services.py
@@ -13,10 +13,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from cinderclient import api_versions
+from cinderclient.v3 import services
+
 from cinderclient.tests.unit import utils
 from cinderclient.tests.unit.v3 import fakes
-from cinderclient.v3 import services
-from cinderclient import api_versions
 
 
 class ServicesTest(utils.TestCase):
diff --git a/cinderclient/tests/unit/v3/test_shell.py b/cinderclient/tests/unit/v3/test_shell.py
index 9221af8bd..a7be695d4 100644
--- a/cinderclient/tests/unit/v3/test_shell.py
+++ b/cinderclient/tests/unit/v3/test_shell.py
@@ -43,20 +43,20 @@ import fixtures
 import mock
 from requests_mock.contrib import fixture as requests_mock_fixture
 import six
-import cinderclient
+from six.moves.urllib import parse
 
+import cinderclient
+from cinderclient import base
 from cinderclient import client
 from cinderclient import exceptions
 from cinderclient import shell
 from cinderclient import utils as cinderclient_utils
-from cinderclient import base
-from cinderclient.v3 import volumes
 from cinderclient.v3 import volume_snapshots
+from cinderclient.v3 import volumes
+
+from cinderclient.tests.unit.fixture_data import keystone_client
 from cinderclient.tests.unit import utils
 from cinderclient.tests.unit.v3 import fakes
-from cinderclient.tests.unit.fixture_data import keystone_client
-
-from six.moves.urllib import parse
 
 
 @ddt.ddt
diff --git a/cinderclient/tests/unit/v3/test_volume_backups.py b/cinderclient/tests/unit/v3/test_volume_backups.py
index 52e843f89..faa0185c2 100644
--- a/cinderclient/tests/unit/v3/test_volume_backups.py
+++ b/cinderclient/tests/unit/v3/test_volume_backups.py
@@ -13,10 +13,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from cinderclient.tests.unit import utils
-from cinderclient.tests.unit.v3 import fakes
 from cinderclient import api_versions
 from cinderclient import exceptions as exc
+from cinderclient.tests.unit import utils
+from cinderclient.tests.unit.v3 import fakes
 
 
 class VolumesTest(utils.TestCase):
diff --git a/cinderclient/tests/unit/v3/test_volumes.py b/cinderclient/tests/unit/v3/test_volumes.py
index 72ef91691..ff7570076 100644
--- a/cinderclient/tests/unit/v3/test_volumes.py
+++ b/cinderclient/tests/unit/v3/test_volumes.py
@@ -21,8 +21,8 @@ from cinderclient import api_versions
 from cinderclient import exceptions
 from cinderclient.tests.unit import utils
 from cinderclient.tests.unit.v3 import fakes
-from cinderclient.v3 import volumes
 from cinderclient.v3 import volume_snapshots
+from cinderclient.v3 import volumes
 
 from six.moves.urllib import parse
 
diff --git a/cinderclient/utils.py b/cinderclient/utils.py
index e1198a205..7d9a7452b 100644
--- a/cinderclient/utils.py
+++ b/cinderclient/utils.py
@@ -20,9 +20,9 @@ import pkg_resources
 import sys
 import uuid
 
+import prettytable
 import six
 from six.moves.urllib import parse
-import prettytable
 
 from cinderclient import exceptions
 from oslo_utils import encodeutils
diff --git a/cinderclient/v1/client.py b/cinderclient/v1/client.py
index 6a54175c1..ca534cf45 100644
--- a/cinderclient/v1/client.py
+++ b/cinderclient/v1/client.py
@@ -20,13 +20,13 @@ from cinderclient.v1 import qos_specs
 from cinderclient.v1 import quota_classes
 from cinderclient.v1 import quotas
 from cinderclient.v1 import services
-from cinderclient.v1 import volumes
-from cinderclient.v1 import volume_snapshots
-from cinderclient.v1 import volume_types
-from cinderclient.v1 import volume_encryption_types
 from cinderclient.v1 import volume_backups
 from cinderclient.v1 import volume_backups_restore
+from cinderclient.v1 import volume_encryption_types
+from cinderclient.v1 import volume_snapshots
 from cinderclient.v1 import volume_transfers
+from cinderclient.v1 import volume_types
+from cinderclient.v1 import volumes
 
 
 class Client(object):
diff --git a/cinderclient/v2/client.py b/cinderclient/v2/client.py
index 1a3fbfae8..a0ad1b883 100644
--- a/cinderclient/v2/client.py
+++ b/cinderclient/v2/client.py
@@ -15,26 +15,26 @@
 
 import logging
 
-from cinderclient import client
 from cinderclient import api_versions
+from cinderclient import client
 from cinderclient.v2 import availability_zones
+from cinderclient.v2 import capabilities
 from cinderclient.v2 import cgsnapshots
 from cinderclient.v2 import consistencygroups
-from cinderclient.v2 import capabilities
 from cinderclient.v2 import limits
 from cinderclient.v2 import pools
 from cinderclient.v2 import qos_specs
 from cinderclient.v2 import quota_classes
 from cinderclient.v2 import quotas
 from cinderclient.v2 import services
-from cinderclient.v2 import volumes
-from cinderclient.v2 import volume_snapshots
-from cinderclient.v2 import volume_types
-from cinderclient.v2 import volume_type_access
-from cinderclient.v2 import volume_encryption_types
 from cinderclient.v2 import volume_backups
 from cinderclient.v2 import volume_backups_restore
+from cinderclient.v2 import volume_encryption_types
+from cinderclient.v2 import volume_snapshots
 from cinderclient.v2 import volume_transfers
+from cinderclient.v2 import volume_type_access
+from cinderclient.v2 import volume_types
+from cinderclient.v2 import volumes
 
 
 class Client(object):
diff --git a/cinderclient/v3/client.py b/cinderclient/v3/client.py
index ef242f4bb..0f3a6bf15 100644
--- a/cinderclient/v3/client.py
+++ b/cinderclient/v3/client.py
@@ -15,17 +15,17 @@
 
 import logging
 
-from cinderclient import client
 from cinderclient import api_versions
+from cinderclient import client
 from cinderclient.v3 import attachments
 from cinderclient.v3 import availability_zones
+from cinderclient.v3 import capabilities
 from cinderclient.v3 import cgsnapshots
 from cinderclient.v3 import clusters
 from cinderclient.v3 import consistencygroups
-from cinderclient.v3 import capabilities
-from cinderclient.v3 import groups
 from cinderclient.v3 import group_snapshots
 from cinderclient.v3 import group_types
+from cinderclient.v3 import groups
 from cinderclient.v3 import limits
 from cinderclient.v3 import messages
 from cinderclient.v3 import pools
@@ -34,14 +34,14 @@ from cinderclient.v3 import quota_classes
 from cinderclient.v3 import quotas
 from cinderclient.v3 import resource_filters
 from cinderclient.v3 import services
-from cinderclient.v3 import volumes
-from cinderclient.v3 import volume_snapshots
-from cinderclient.v3 import volume_types
-from cinderclient.v3 import volume_type_access
-from cinderclient.v3 import volume_encryption_types
 from cinderclient.v3 import volume_backups
 from cinderclient.v3 import volume_backups_restore
+from cinderclient.v3 import volume_encryption_types
+from cinderclient.v3 import volume_snapshots
 from cinderclient.v3 import volume_transfers
+from cinderclient.v3 import volume_type_access
+from cinderclient.v3 import volume_types
+from cinderclient.v3 import volumes
 
 
 class Client(object):
diff --git a/cinderclient/v3/group_snapshots.py b/cinderclient/v3/group_snapshots.py
index 01e70734a..461a41c68 100644
--- a/cinderclient/v3/group_snapshots.py
+++ b/cinderclient/v3/group_snapshots.py
@@ -16,8 +16,8 @@
 """group snapshot interface (v3)."""
 
 
-from cinderclient.apiclient import base as common_base
 from cinderclient import api_versions
+from cinderclient.apiclient import base as common_base
 from cinderclient import base
 from cinderclient import utils
 
diff --git a/cinderclient/v3/groups.py b/cinderclient/v3/groups.py
index 6bc298a25..d22afe429 100644
--- a/cinderclient/v3/groups.py
+++ b/cinderclient/v3/groups.py
@@ -17,8 +17,8 @@
 from six.moves.urllib import parse
 
 from cinderclient import api_versions
-from cinderclient import base
 from cinderclient.apiclient import base as common_base
+from cinderclient import base
 from cinderclient import utils
 
 
diff --git a/cinderclient/v3/messages.py b/cinderclient/v3/messages.py
index 8efd08884..fa07fdf95 100644
--- a/cinderclient/v3/messages.py
+++ b/cinderclient/v3/messages.py
@@ -12,8 +12,8 @@
 
 """Message interface (v3 extension)."""
 
-from cinderclient import base
 from cinderclient import api_versions
+from cinderclient import base
 
 
 class Message(base.Resource):
diff --git a/cinderclient/v3/resource_filters.py b/cinderclient/v3/resource_filters.py
index c726f8c34..e7ca6554d 100644
--- a/cinderclient/v3/resource_filters.py
+++ b/cinderclient/v3/resource_filters.py
@@ -12,8 +12,8 @@
 
 """Resource filters interface."""
 
-from cinderclient import base
 from cinderclient import api_versions
+from cinderclient import base
 
 
 class ResourceFilter(base.Resource):
diff --git a/cinderclient/v3/volumes.py b/cinderclient/v3/volumes.py
index 2e4eadca0..e55871fe5 100644
--- a/cinderclient/v3/volumes.py
+++ b/cinderclient/v3/volumes.py
@@ -14,8 +14,8 @@
 #    under the License.
 
 """Volume interface (v3 extension)."""
-from cinderclient.apiclient import base as common_base
 from cinderclient import api_versions
+from cinderclient.apiclient import base as common_base
 from cinderclient import base
 from cinderclient.v2 import volumes
 
diff --git a/tox.ini b/tox.ini
index d235bfde7..d5bb58fc3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -57,5 +57,5 @@ passenv = OS_*
 
 [flake8]
 show-source = True
-ignore = F811,F821,H306,H404,H405,E122,E123,E128,E251
+ignore = F811,F821,H404,H405,E122,E123,E128,E251
 exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build