diff --git a/test-requirements.txt b/test-requirements.txt
index 040d99f49..4a35eae08 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,7 +2,7 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-hacking>=0.9.2,<0.10
+hacking>=0.10.0,<0.11
 
 coverage>=3.6
 discover
diff --git a/tox.ini b/tox.ini
index acb9562c4..6bff7da80 100644
--- a/tox.ini
+++ b/tox.ini
@@ -35,7 +35,8 @@ ignore = E123,E124,E125,H803
 [flake8]
 # H803 skipped on purpose per list discussion.
 # E123, E125 skipped as they are invalid PEP-8.
+# H105 skipped as we're allowing @author tags here
 show-source = True
-ignore = E123,E125,H803
+ignore = H105,E123,E125,H803
 builtins = _
 exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,tools