diff --git a/openstack/tests/unit/orchestration/test_version.py b/openstack/tests/unit/orchestration/test_version.py
index 3e59a4994..20fceb315 100644
--- a/openstack/tests/unit/orchestration/test_version.py
+++ b/openstack/tests/unit/orchestration/test_version.py
@@ -10,9 +10,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from openstack.orchestration import version
 from openstack.tests.unit import base
 
-from openstack.orchestration import version
 
 IDENTIFIER = 'IDENTIFIER'
 EXAMPLE = {
diff --git a/openstack/tests/unit/orchestration/v1/test_proxy.py b/openstack/tests/unit/orchestration/v1/test_proxy.py
index 8c4943e87..94255a6bc 100644
--- a/openstack/tests/unit/orchestration/v1/test_proxy.py
+++ b/openstack/tests/unit/orchestration/v1/test_proxy.py
@@ -9,10 +9,11 @@
 # 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 testscenarios import load_tests_apply_scenarios as load_tests  # noqa
 
 from unittest import mock
 
+from testscenarios import load_tests_apply_scenarios as load_tests  # noqa
+
 from openstack import exceptions
 from openstack.orchestration.v1 import _proxy
 from openstack.orchestration.v1 import resource
diff --git a/openstack/tests/unit/orchestration/v1/test_resource.py b/openstack/tests/unit/orchestration/v1/test_resource.py
index ac3e3253c..2e3708a15 100644
--- a/openstack/tests/unit/orchestration/v1/test_resource.py
+++ b/openstack/tests/unit/orchestration/v1/test_resource.py
@@ -10,9 +10,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.tests.unit import base
-
 from openstack.orchestration.v1 import resource
+from openstack.tests.unit import base
 
 
 FAKE_ID = '32e39358-2422-4ad0-a1b5-dd60696bf564'
diff --git a/openstack/tests/unit/orchestration/v1/test_software_config.py b/openstack/tests/unit/orchestration/v1/test_software_config.py
index de47a090a..439b2e100 100644
--- a/openstack/tests/unit/orchestration/v1/test_software_config.py
+++ b/openstack/tests/unit/orchestration/v1/test_software_config.py
@@ -10,9 +10,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.tests.unit import base
-
 from openstack.orchestration.v1 import software_config
+from openstack.tests.unit import base
 
 
 FAKE_ID = 'ce8ae86c-9810-4cb1-8888-7fb53bc523bf'
diff --git a/openstack/tests/unit/orchestration/v1/test_software_deployment.py b/openstack/tests/unit/orchestration/v1/test_software_deployment.py
index 3dad1a61b..7c9640e79 100644
--- a/openstack/tests/unit/orchestration/v1/test_software_deployment.py
+++ b/openstack/tests/unit/orchestration/v1/test_software_deployment.py
@@ -10,9 +10,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from openstack.orchestration.v1 import software_deployment
 from openstack.tests.unit import base
 
-from openstack.orchestration.v1 import software_deployment
 
 FAKE = {
     'id': 'ce8ae86c-9810-4cb1-8888-7fb53bc523bf',
diff --git a/openstack/tests/unit/orchestration/v1/test_stack_environment.py b/openstack/tests/unit/orchestration/v1/test_stack_environment.py
index 08737dc7e..03c39f3fc 100644
--- a/openstack/tests/unit/orchestration/v1/test_stack_environment.py
+++ b/openstack/tests/unit/orchestration/v1/test_stack_environment.py
@@ -10,9 +10,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.tests.unit import base
-
 from openstack.orchestration.v1 import stack_environment as se
+from openstack.tests.unit import base
 
 
 FAKE = {
diff --git a/openstack/tests/unit/orchestration/v1/test_stack_template.py b/openstack/tests/unit/orchestration/v1/test_stack_template.py
index 1de5120af..60ed9d1a5 100644
--- a/openstack/tests/unit/orchestration/v1/test_stack_template.py
+++ b/openstack/tests/unit/orchestration/v1/test_stack_template.py
@@ -11,9 +11,9 @@
 # under the License.
 
 import copy
-from openstack.tests.unit import base
 
 from openstack.orchestration.v1 import stack_template
+from openstack.tests.unit import base
 
 
 FAKE = {
diff --git a/tox.ini b/tox.ini
index a202d28d9..e585a015b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -125,7 +125,6 @@ per-file-ignores =
     openstack/tests/unit/block_storage/*:H306,I100,I201,I202
     openstack/tests/unit/cloud/*:H306,I100,I201,I202
     openstack/tests/unit/clustering/*:H306,I100,I201,I202
-    openstack/tests/unit/orchestration/*:H306,I100,I201,I202
 
 [flake8:local-plugins]
 extension =