diff --git a/neutron_fwaas/__init__.py b/neutron_fwaas/__init__.py
index fa7a241e5..208ffbf15 100644
--- a/neutron_fwaas/__init__.py
+++ b/neutron_fwaas/__init__.py
@@ -14,6 +14,7 @@
 #    under the License.
 
 import gettext
+
 import six
 
 
diff --git a/neutron_fwaas/extensions/firewall_v2.py b/neutron_fwaas/extensions/firewall_v2.py
index 1adf10cff..b44c3ddf3 100644
--- a/neutron_fwaas/extensions/firewall_v2.py
+++ b/neutron_fwaas/extensions/firewall_v2.py
@@ -13,6 +13,7 @@
 # under the License.
 
 import abc
+
 from neutron.api.v2 import resource_helper
 from neutron_lib.api import converters
 from neutron_lib.api import extensions
diff --git a/neutron_fwaas/tests/unit/services/firewall/drivers/linux/test_iptables_fwaas.py b/neutron_fwaas/tests/unit/services/firewall/drivers/linux/test_iptables_fwaas.py
index 889117e1f..64e972d6b 100644
--- a/neutron_fwaas/tests/unit/services/firewall/drivers/linux/test_iptables_fwaas.py
+++ b/neutron_fwaas/tests/unit/services/firewall/drivers/linux/test_iptables_fwaas.py
@@ -14,10 +14,11 @@
 #    under the License.
 
 import copy
-import mock
 
+import mock
 from neutron.tests import base
 from neutron.tests.unit.api.v2 import test_base as test_api_v2
+
 import neutron_fwaas.services.firewall.drivers.linux.iptables_fwaas as fwaas
 
 
diff --git a/neutron_fwaas/tests/unit/services/firewall/drivers/linux/test_iptables_fwaas_v2.py b/neutron_fwaas/tests/unit/services/firewall/drivers/linux/test_iptables_fwaas_v2.py
index 3953be711..f973738a5 100644
--- a/neutron_fwaas/tests/unit/services/firewall/drivers/linux/test_iptables_fwaas_v2.py
+++ b/neutron_fwaas/tests/unit/services/firewall/drivers/linux/test_iptables_fwaas_v2.py
@@ -14,10 +14,11 @@
 #    under the License.
 
 import copy
-import mock
 
+import mock
 from neutron.tests import base
 from neutron.tests.unit.api.v2 import test_base as test_api_v2
+
 import neutron_fwaas.services.firewall.drivers.linux.iptables_fwaas_v2 as fwaas
 
 
diff --git a/neutron_fwaas/tests/unit/services/firewall/test_fwaas_plugin.py b/neutron_fwaas/tests/unit/services/firewall/test_fwaas_plugin.py
index ecac27896..53497690f 100644
--- a/neutron_fwaas/tests/unit/services/firewall/test_fwaas_plugin.py
+++ b/neutron_fwaas/tests/unit/services/firewall/test_fwaas_plugin.py
@@ -13,18 +13,23 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-import mock
-import testtools
+import uuid
 
+import mock
 from neutron.api import extensions as api_ext
 from neutron.common import config
 from neutron.tests.common import helpers
 from neutron.tests import fake_notifier
 from neutron.tests.unit.extensions import test_agent
 from neutron.tests.unit.extensions import test_l3 as test_l3_plugin
+from neutron_lib.api import attributes as attr
+from neutron_lib import constants as nl_constants
+from neutron_lib import context
+from neutron_lib.plugins import constants as plugin_constants
+from neutron_lib.plugins import directory
 from oslo_config import cfg
 import six
-import uuid
+import testtools
 from webob import exc
 
 from neutron_fwaas.db.firewall import firewall_db as fdb
@@ -36,12 +41,6 @@ from neutron_fwaas.tests import base
 from neutron_fwaas.tests.unit.db.firewall import (
     test_firewall_db as test_db_firewall)
 
-from neutron_lib.api import attributes as attr
-from neutron_lib import constants as nl_constants
-from neutron_lib import context
-from neutron_lib.plugins import constants as plugin_constants
-from neutron_lib.plugins import directory
-
 extensions_path = neutron_fwaas.extensions.__path__[0]
 
 FW_PLUGIN_KLASS = (
diff --git a/test-requirements.txt b/test-requirements.txt
index c7e193818..da2599e76 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,6 +5,7 @@ hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
 
 coverage!=4.4,>=4.0 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
+flake8-import-order==0.12 # LGPLv3
 mock>=2.0 # BSD
 python-subunit>=0.0.18 # Apache-2.0/BSD
 requests-mock>=1.1 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 424c91346..27f9a6415 100644
--- a/tox.ini
+++ b/tox.ini
@@ -96,6 +96,7 @@ ignore = E125,E126,E128,E129,E265,H404,H405,N530,N537
 enable-extensions=H904
 show-source = true
 exclude = .venv,.git,.tox,dist,doc,*lib/python*,.tmp,*egg,build,tools,.ropeproject,rally-scenarios
+import-order-style = pep8
 
 [testenv:pylint]
 deps =