diff --git a/test-requirements.txt b/test-requirements.txt
index cebcd65..da40880 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -3,7 +3,7 @@
 # process, which may cause wedges in the gate later.
 
 # Hacking should appear first in case something else depends on pep8
-hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
+hacking>=1.1.0 # Apache-2.0
 
 coverage!=4.4,>=4.0 # Apache-2.0
 flake8-import-order==0.13 # LGPLv3
diff --git a/tox.ini b/tox.ini
index 177c44d..5daac23 100644
--- a/tox.ini
+++ b/tox.ini
@@ -58,6 +58,12 @@ exclude = .venv,.git,.tox,dist,*lib/python*,*egg,build,node_modules,.tmp
 # H203 Use assertIs(Not)None to check for None
 # H904 Delay string interpolations at logging calls
 enable-extensions=H203,H904
+# W504 line break after binary operator
+# (W503 and W504 are incompatible and we need to choose one of them.
+#  Existing codes follows W503, so we disable W504.)
+# F405 TEMPLATES may be undefined, or defined from star imports
+# (because it is not easy to avoid this in openstack_dashboard.test.settings)
+ignore = W504,F405
 max-complexity = 20
 
 # flake8-import-order configurations