diff --git a/openstack/auth/base.py b/openstack/auth/base.py
index 49fd989e..2f237900 100644
--- a/openstack/auth/base.py
+++ b/openstack/auth/base.py
@@ -11,6 +11,7 @@
 # under the License.
 
 import abc
+
 import six
 
 
diff --git a/openstack/auth/identity/base.py b/openstack/auth/identity/base.py
index da3af8ca..5573a378 100644
--- a/openstack/auth/identity/base.py
+++ b/openstack/auth/identity/base.py
@@ -11,6 +11,7 @@
 # under the License.
 
 import abc
+
 import six
 
 from openstack.auth import base
diff --git a/openstack/auth/service_catalog.py b/openstack/auth/service_catalog.py
index 61e51b16..e80d8c9b 100644
--- a/openstack/auth/service_catalog.py
+++ b/openstack/auth/service_catalog.py
@@ -17,6 +17,7 @@
 # limitations under the License.
 
 import copy
+
 import six
 
 from openstack import exceptions
diff --git a/openstack/resource.py b/openstack/resource.py
index 36fc0c97..288ff1f7 100644
--- a/openstack/resource.py
+++ b/openstack/resource.py
@@ -14,7 +14,7 @@ import abc
 import collections
 
 import six
-from six.moves.urllib import parse as url_parse
+from six.moves.urllib import parse as url_parse  # flake8: noqa
 
 from openstack import exceptions
 from openstack import utils
diff --git a/openstack/tests/__init__.py b/openstack/tests/__init__.py
index 19f5e722..e69de29b 100644
--- a/openstack/tests/__init__.py
+++ b/openstack/tests/__init__.py
@@ -1,13 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
diff --git a/openstack/tests/auth/__init__.py b/openstack/tests/auth/__init__.py
index 19f5e722..e69de29b 100644
--- a/openstack/tests/auth/__init__.py
+++ b/openstack/tests/auth/__init__.py
@@ -1,13 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
diff --git a/openstack/tests/auth/identity/__init__.py b/openstack/tests/auth/identity/__init__.py
index 19f5e722..e69de29b 100644
--- a/openstack/tests/auth/identity/__init__.py
+++ b/openstack/tests/auth/identity/__init__.py
@@ -1,13 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
diff --git a/openstack/tests/auth/identity/utils.py b/openstack/tests/auth/identity/utils.py
index 7aecd189..10cd9ccb 100644
--- a/openstack/tests/auth/identity/utils.py
+++ b/openstack/tests/auth/identity/utils.py
@@ -20,7 +20,7 @@ import httpretty
 import mock
 import requests
 import six
-from six.moves.urllib import parse as urlparse
+from six.moves.urllib import parse as urlparse  # flake8: noqa
 import testtools
 
 
diff --git a/openstack/tests/test_transport.py b/openstack/tests/test_transport.py
index 88c47adc..c83a38d8 100644
--- a/openstack/tests/test_transport.py
+++ b/openstack/tests/test_transport.py
@@ -12,12 +12,11 @@
 
 import json
 import logging
-import six
 
 import fixtures
 import httpretty
-
 import requests
+import six
 
 from openstack import exceptions
 from openstack.tests import base
diff --git a/test-requirements.txt b/test-requirements.txt
index 297ccbae..8e5ccd1f 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,4 +1,4 @@
-hacking>=0.0.8,<0.9
+hacking>=0.9.1,<0.10
 
 coverage>=3.6
 discover
diff --git a/tox.ini b/tox.ini
index cf61d3a4..a45c4a0f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -22,8 +22,10 @@ commands = {posargs}
 commands = python setup.py testr --coverage --testr-args='{posargs}'
 
 [flake8]
+# H404, H405 are docstring rules that were not followed at the time of their
+#   addition, feel free to fix
 # H803 skipped on purpose per list discussion.
 # E123, E125 skipped as they are invalid PEP-8.
 show-source = True
-ignore = E123,E125,H803
+ignore = E123,E125,H404,H405,H803
 exclude=api_strawman/,.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build