diff --git a/test-requirements.txt b/test-requirements.txt
index 59345ba..896b34c 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<0.11,>=0.10.0
+hacking>=3.0,<3.1.0 # Apache-2.0
 
 # Used for making sure the eventlet executors work.
 eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT
diff --git a/tox.ini b/tox.ini
index 3e1e6a3..965bc6a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -48,7 +48,7 @@ commands = oslo_debug_helper {posargs}
 [flake8]
 # E123, E125 skipped as they are invalid PEP-8.
 show-source = True
-ignore = E123,E125
+ignore = E123,E125,E731,W504
 exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build
 
 [testenv:releasenotes]