diff --git a/openstack/tests/unit/dns/v2/test_floating_ip.py b/openstack/tests/unit/dns/v2/test_floating_ip.py
index 412e453c9..f1e6b19cd 100644
--- a/openstack/tests/unit/dns/v2/test_floating_ip.py
+++ b/openstack/tests/unit/dns/v2/test_floating_ip.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.dns.v2 import floating_ip as fip
+from openstack.tests.unit import base
 
 
 IDENTIFIER = 'RegionOne:id'
diff --git a/openstack/tests/unit/dns/v2/test_proxy.py b/openstack/tests/unit/dns/v2/test_proxy.py
index fe7694c27..125035e92 100644
--- a/openstack/tests/unit/dns/v2/test_proxy.py
+++ b/openstack/tests/unit/dns/v2/test_proxy.py
@@ -11,12 +11,12 @@
 # under the License.
 
 from openstack.dns.v2 import _proxy
-from openstack.dns.v2 import zone
-from openstack.dns.v2 import zone_import
-from openstack.dns.v2 import zone_export
-from openstack.dns.v2 import zone_transfer
-from openstack.dns.v2 import recordset
 from openstack.dns.v2 import floating_ip
+from openstack.dns.v2 import recordset
+from openstack.dns.v2 import zone
+from openstack.dns.v2 import zone_export
+from openstack.dns.v2 import zone_import
+from openstack.dns.v2 import zone_transfer
 from openstack.tests.unit import test_proxy_base
 
 
diff --git a/openstack/tests/unit/dns/v2/test_recordset.py b/openstack/tests/unit/dns/v2/test_recordset.py
index e53aa4938..a1eb2706c 100644
--- a/openstack/tests/unit/dns/v2/test_recordset.py
+++ b/openstack/tests/unit/dns/v2/test_recordset.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.dns.v2 import recordset
+from openstack.tests.unit import base
 
 
 IDENTIFIER = 'NAME'
diff --git a/openstack/tests/unit/dns/v2/test_zone_transfer.py b/openstack/tests/unit/dns/v2/test_zone_transfer.py
index 7064834fe..bc8ba1a80 100644
--- a/openstack/tests/unit/dns/v2/test_zone_transfer.py
+++ b/openstack/tests/unit/dns/v2/test_zone_transfer.py
@@ -9,9 +9,9 @@
 # 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 openstack.tests.unit import base
 
 from openstack.dns.v2 import zone_transfer
+from openstack.tests.unit import base
 
 
 IDENTIFIER = '074e805e-fe87-4cbb-b10b-21a06e215d41'
diff --git a/openstack/tests/unit/image/v1/test_image.py b/openstack/tests/unit/image/v1/test_image.py
index d593e727d..9809b91a6 100644
--- a/openstack/tests/unit/image/v1/test_image.py
+++ b/openstack/tests/unit/image/v1/test_image.py
@@ -10,9 +10,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from openstack.image.v1 import image
 from openstack.tests.unit import base
 
-from openstack.image.v1 import image
 
 IDENTIFIER = 'IDENTIFIER'
 EXAMPLE = {
diff --git a/openstack/tests/unit/image/v2/test_image.py b/openstack/tests/unit/image/v2/test_image.py
index 45932cc83..9ddd95305 100644
--- a/openstack/tests/unit/image/v2/test_image.py
+++ b/openstack/tests/unit/image/v2/test_image.py
@@ -9,6 +9,7 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
+
 import io
 import operator
 import tempfile
diff --git a/openstack/tests/unit/image/v2/test_member.py b/openstack/tests/unit/image/v2/test_member.py
index 7fc603862..8168b1254 100644
--- a/openstack/tests/unit/image/v2/test_member.py
+++ b/openstack/tests/unit/image/v2/test_member.py
@@ -10,9 +10,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from openstack.image.v2 import member
 from openstack.tests.unit import base
 
-from openstack.image.v2 import member
 
 IDENTIFIER = 'IDENTIFIER'
 EXAMPLE = {
diff --git a/openstack/tests/unit/image/v2/test_proxy.py b/openstack/tests/unit/image/v2/test_proxy.py
index 672c15057..bba3333a5 100644
--- a/openstack/tests/unit/image/v2/test_proxy.py
+++ b/openstack/tests/unit/image/v2/test_proxy.py
@@ -20,8 +20,8 @@ from openstack.image.v2 import _proxy
 from openstack.image.v2 import image
 from openstack.image.v2 import member
 from openstack.image.v2 import schema
-from openstack.image.v2 import task
 from openstack.image.v2 import service_info as si
+from openstack.image.v2 import task
 from openstack.tests.unit.image.v2 import test_image as fake_image
 from openstack.tests.unit import test_proxy_base
 
diff --git a/openstack/tests/unit/image/v2/test_schema.py b/openstack/tests/unit/image/v2/test_schema.py
index 88e0823cf..ed5cddb15 100644
--- a/openstack/tests/unit/image/v2/test_schema.py
+++ b/openstack/tests/unit/image/v2/test_schema.py
@@ -10,9 +10,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from openstack.image.v2 import schema
 from openstack.tests.unit import base
 
-from openstack.image.v2 import schema
 
 IDENTIFIER = 'IDENTIFIER'
 EXAMPLE = {
diff --git a/openstack/tests/unit/image/v2/test_service_info.py b/openstack/tests/unit/image/v2/test_service_info.py
index 6d8c85f92..f00ab88ff 100644
--- a/openstack/tests/unit/image/v2/test_service_info.py
+++ b/openstack/tests/unit/image/v2/test_service_info.py
@@ -10,9 +10,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from openstack.image.v2 import service_info as si
 from openstack.tests.unit import base
 
-from openstack.image.v2 import service_info as si
 
 IDENTIFIER = 'IDENTIFIER'
 EXAMPLE_IMPORT = {
diff --git a/openstack/tests/unit/image/v2/test_task.py b/openstack/tests/unit/image/v2/test_task.py
index f137f0611..6b1e3f35b 100644
--- a/openstack/tests/unit/image/v2/test_task.py
+++ b/openstack/tests/unit/image/v2/test_task.py
@@ -10,9 +10,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from openstack.image.v2 import task
 from openstack.tests.unit import base
 
-from openstack.image.v2 import task
 
 IDENTIFIER = 'IDENTIFIER'
 EXAMPLE = {
diff --git a/tox.ini b/tox.ini
index 6786233ae..91a6a7625 100644
--- a/tox.ini
+++ b/tox.ini
@@ -135,8 +135,6 @@ per-file-ignores =
     openstack/tests/unit/baremetal/*:H306,I100,I201,I202
     openstack/tests/unit/compute/*:H306,I100,I201,I202
     openstack/tests/unit/network/*:H306,I100,I201,I202
-    openstack/tests/unit/image/*:H306,I100,I201,I202
-    openstack/tests/unit/dns/*:H306,I100,I201,I202
 
 [flake8:local-plugins]
 extension =