diff --git a/test-requirements.txt b/test-requirements.txt
index 1d9b42a9..8289d37f 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,4 +1,4 @@
 # hacking pulls in flake8
-hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
+hacking
 bashate >= 0.2
 pylint<2.5.0
diff --git a/tox.ini b/tox.ini
index c8add65d..e2ac7e13 100644
--- a/tox.ini
+++ b/tox.ini
@@ -50,6 +50,9 @@ commands =
 # F841 local variable 'FOO' is assigned to but never used
 # W291 trailing whitespace
 # W391 blank line at end of file
+# W503 line break before binary operator
+# W504 line break after binary operator
+# W605 invalid escape sequence '\s'
 # E128 continuation line under-indented for visual indent
 # E221 multiple spaces before operator
 # E226 missing whitespace around arithmetic operator
@@ -57,9 +60,11 @@ commands =
 # E241 multiple spaces after ','
 # E265 block comment should start with '# '
 # E302 expected 2 blank lines, found 1
+# E305 expected 2 blank lines after class or function definition, found 1
 # E501 line too long
 # E502 the backslash is redundant between brackets
 # E702 multiple statements on one line (semicolon)
+# E722 do not use bare 'except'
 # H101 is TODO
 # H104  File contains nothing but comments
 # H201  no 'except:' at least use 'except Exception:'
@@ -67,7 +72,7 @@ commands =
 # H306  imports not in alphabetical order (sys, re)
 # H401  docstring should not start with a space
 # H405  multi line docstring summary not separated with an empty line
-ignore = F401,F841,W291,W391,E128,E221,E226,E227,E241,E265,E302,E501,E502,E702,H101,H104,H201,H238,H306,H401,H405
+ignore = F401,F841,W291,W391,W503,W504,W605,E128,E221,E226,E227,E241,E265,E302,E305,E501,E502,E702,E722,H101,H104,H201,H238,H306,H401,H405
 # max-line-length is not referenced if E501 is suppressed
 max-line-length=80