diff --git a/openstackclient/tests/functional/compute/v2/test_keypair.py b/openstackclient/tests/functional/compute/v2/test_keypair.py
index 1e1a03d67d..9a88e66fca 100644
--- a/openstackclient/tests/functional/compute/v2/test_keypair.py
+++ b/openstackclient/tests/functional/compute/v2/test_keypair.py
@@ -13,11 +13,11 @@
 import json
 import tempfile
 
-from openstackclient.tests.functional import base
-
 from tempest.lib.common.utils import data_utils
 from tempest.lib import exceptions
 
+from openstackclient.tests.functional import base
+
 
 class KeypairBase(base.TestCase):
     """Methods for functional tests."""
diff --git a/openstackclient/tests/functional/identity/v3/test_service_provider.py b/openstackclient/tests/functional/identity/v3/test_service_provider.py
index e072bc93b1..32b7a463d1 100644
--- a/openstackclient/tests/functional/identity/v3/test_service_provider.py
+++ b/openstackclient/tests/functional/identity/v3/test_service_provider.py
@@ -10,9 +10,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from openstackclient.tests.functional.identity.v3 import common
 from tempest.lib.common.utils import data_utils
 
+from openstackclient.tests.functional.identity.v3 import common
+
 
 class ServiceProviderTests(common.IdentityTests):
     # Introduce functional test cases for command 'Service Provider'
diff --git a/openstackclient/tests/unit/api/test_compute_v2.py b/openstackclient/tests/unit/api/test_compute_v2.py
index f10fb6cfcf..56b35937c7 100644
--- a/openstackclient/tests/unit/api/test_compute_v2.py
+++ b/openstackclient/tests/unit/api/test_compute_v2.py
@@ -13,12 +13,12 @@
 
 """Compute v2 API Library Tests"""
 
+from keystoneclient import session
+from osc_lib import exceptions as osc_lib_exceptions
 from requests_mock.contrib import fixture
 
-from keystoneclient import session
 from openstackclient.api import compute_v2 as compute
 from openstackclient.tests.unit import utils
-from osc_lib import exceptions as osc_lib_exceptions
 
 
 FAKE_PROJECT = 'xyzpdq'
diff --git a/openstackclient/tests/unit/network/test_common.py b/openstackclient/tests/unit/network/test_common.py
index c8dce0af83..d4d3a277f4 100644
--- a/openstackclient/tests/unit/network/test_common.py
+++ b/openstackclient/tests/unit/network/test_common.py
@@ -14,8 +14,8 @@
 import argparse
 
 import mock
-
 import openstack
+
 from openstackclient.common import exceptions
 from openstackclient.network import common
 from openstackclient.tests.unit import utils
diff --git a/tox.ini b/tox.ini
index 68b01b4537..7716ffb4c4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -92,3 +92,4 @@ exclude = .git,.tox,dist,doc,*lib/python*,*egg,build,tools
 # Doc: http://flake8.readthedocs.org/en/latest/config.html#default
 ignore = __
 import-order-style = pep8
+application_import_names = openstackclient