diff --git a/test-requirements.txt b/test-requirements.txt
index a00cf13..948cede 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>=1.1.0,<1.2.0
+hacking>=2.0.0,<=2.1.0
 coverage>=3.6
 doc8
 fixtures>=1.3.1
diff --git a/tox.ini b/tox.ini
index 97828ac..91e2d85 100644
--- a/tox.ini
+++ b/tox.ini
@@ -33,11 +33,12 @@ commands =
 [flake8]
 # H803 skipped on purpose per list discussion.
 # E123, E125 skipped as they are invalid PEP-8.
+# W504 line break after binary operator - We use W503 instead
 
 show-source = True
-ignore = E123,E125,H803
+ignore = E123,E125,H803,W504
 builtins = _
-exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build
+exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build
 
 [testenv:dashboards]
 commands =