diff --git a/test-requirements.txt b/test-requirements.txt
index e73a995c7..9bf01e04f 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,3 +1,5 @@
+hacking>=0.8.0,<0.9
+
 pep8==1.4.5
 pyflakes>=0.7.2,<0.7.4
 flake8==2.0
diff --git a/tox.ini b/tox.ini
index 1a8f5fedd..e7435cfa9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -38,5 +38,6 @@ commands = bash tools/lintstack.sh
 
 [flake8]
 show-source = true
+ignore = E226,H101,H201,H231,H233,H301,H302,H306,H402,H404,H803
 builtins = _
 exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,tools