diff --git a/test-requirements.txt b/test-requirements.txt
index ba9e5eb..92ebf95 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,8 +1,8 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-hacking>=0.12.0,!=0.13.0,<0.14  # Apache-2.0
-
+hacking>=0.12.0,!=0.13.0,<0.14;python_version=='2.7'  # Apache-2.0
+hacking>=3.1.0;python_version>='3.5'
 coverage>=3.6
 # docutils==0.9.1
 fixtures>=1.3.1
diff --git a/tox.ini b/tox.ini
index 3e3f99f..7372638 100644
--- a/tox.ini
+++ b/tox.ini
@@ -35,7 +35,7 @@ commands = python setup.py build_sphinx
 [flake8]
 # E125 continuation line does not distinguish itself from next logical line
 # H404 multi line docstring should start with a summary
-ignore = E125,H404
+ignore = E125,H404,E741,W504,E305
 show-source = true
 builtins = _
 exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,tools,build,*openstack/common*