diff --git a/test-requirements.txt b/test-requirements.txt
index 6cd28a03cb..cc80dd5b91 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -3,7 +3,7 @@
 # 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.9.4,<0.10
 coverage>=3.6
 discover
 lockfile>=0.8
diff --git a/tox.ini b/tox.ini
index 2c1427826f..849471afe1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -53,9 +53,24 @@ commands =
   bash tools/config/generate_sample.sh -b . -p heat -o etc/heat
 
 [flake8]
+# E122 continuation line missing indentation or outdented
+# E126 continuation line over-indented for hanging indent
+# E128 continuation line under-indented for visual indent
+# E251 unexpected spaces around keyword / parameter equals
+# E265 block comment should start with '# '
+# F402 import shadowed by loop variable
+# F812 list comprehension redefines variable
+# H101 Use TODO(NAME)
+# H202 assertRaises Exception too broad
+# H233 Python 3.x incompatible use of print operator
+# H305 imports not grouped correctly
+# H307 like imports should be grouped togethe
+# H402 one line docstring needs punctuation
 # H404 multi line docstring should start with a summary
+# H405 multi line docstring summary not separated with an empty line
 # H803 no full stop at the end of the commit message
-ignore = H404,H803
+# H904 Wrap long lines in parentheses instead of a backslash
+ignore = E122,E126,E128,E251,E265,F402,F812,H101,H202,H233,H305,H307,H402,H404,H405,H803,H904
 show-source = true
 exclude=.venv,.git,.tox,dist,*openstack/common*,*lib/python*,*egg,tools,build
 max-complexity=20