diff --git a/test-requirements.txt b/test-requirements.txt
index a095c1c1..bb4fef89 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,4 +1,4 @@
-hacking>=0.8.0,<0.9
+hacking>=0.9.1,<0.10
 
 MySQL-python
 coverage>=3.6
diff --git a/tox.ini b/tox.ini
index a9bbeda1..a8e9bf81 100644
--- a/tox.ini
+++ b/tox.ini
@@ -48,6 +48,21 @@ setenv = VIRTUAL_ENV={envdir}
 commands = bash tools/lintstack.sh
 
 [flake8]
+# E112 expected an indented block
+# E122 continuation line missing indentation or outdented
+# E128 continuation line under-indented for visual indent
+# E226 missing whitespace around arithmetic operator
+# E241 multiple spaces after ':'
+# E251 unexpected spaces around keyword / parameter equals
+# E265 block comment should start with '# '
+# E713 test for membership should be 'not in'
+# F402 import 'u' from line 23 shadowed by loop variable
+# H202 assertRaises Exception too broad
+# H305 imports not grouped correctly (re: stdlib, six: third-party)
+# H307 like imports should be grouped together (six and oslo.config.cfg from third-party are separated by whitespace)
+# H405 multi line docstring summary not separated with an empty line
+# H904 Wrap long lines in parentheses instead of a backslash
+ignore = E112,E122,E128,E226,E241,E251,E265,E713,F402,H202,H305,H307,H405,H904
 show-source = true
 builtins = _
 exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,tools