diff --git a/test-requirements.txt b/test-requirements.txt
index 98c68238..e44e920e 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,7 +1,7 @@
 # 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>=1.1.0,<1.2.0 # Apache-2.0
+hacking>=3.0,<3.1.0 # Apache-2.0
 mock>=2.0.0 # BSD
 oslotest>=3.2.0 # Apache-2.0
 pifpaf>=0.10.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 0143d47b..5379f0e0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -50,7 +50,7 @@ commands =
 
 [flake8]
 show-source = True
-ignore = H405
+ignore = H405,W504,F405
 builtins = _
 exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build