diff --git a/test-requirements.txt b/test-requirements.txt
index 3b67dc9ecd..d3fa398d9a 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 already pins down pep8, pyflakes and flake8
-hacking>=0.8.0,<0.9
+hacking>=0.10.0,<0.11
 sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
 oslosphinx>=2.5.0  # Apache-2.0
 
diff --git a/tox.ini b/tox.ini
index 6caed0a05b..b65a3fb5d2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -43,7 +43,7 @@ commands = {posargs}
 show-source = True
 # H301 and H306 are ignored on purpose.
 # The rest of the ignores are TODOs.
-ignore = F821,H301,H306,H404
+ignore = E111,E122,E123,E128,E251,E265,E713,F821,H105,H237,H238,H301,H305,H306,H307,H402,H404,H405,H407,H501,H904
 builtins = _
 exclude=.venv,.tox,dist,doc,openstack,*egg,rsdns,tools,etc,build,*.po,*.pot
 filename=*.py,trove-*