diff --git a/test-requirements.txt b/test-requirements.txt
index b3f7eed5be..ca52315e64 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -3,7 +3,7 @@
 # process, which may cause wedges in the gate later.
 
 # Hacking already pins down pep8, pyflakes and flake8
-hacking>=0.8.0,<0.9
+hacking>=0.10.0,<0.11
 coverage
 nose
 nosexcover
diff --git a/tox.ini b/tox.ini
index 8b7061a026..886174fdcd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -50,14 +50,24 @@ commands = {posargs}
 commands = python setup.py build_sphinx
 
 [flake8]
-# it's not a bug that we aren't using all of hacking
-# H102 -> apache2 license exists
-# H103 -> license is apache
-# H201 -> no bare excepts (unless marked with "  # noqa")
-# H231 -> Check for except statements to be Python 3.x compatible
-# H501 -> don't use locals() for str formatting
-# H903 -> \n not \r\n
-ignore = H
-select = F,E,W,H102,H103,H201,H231,H501,H903
+# it's not a bug that we aren't using all of hacking, ignore:
+# F402: import '_' from line 51 shadowed by loop variable
+# F812: list comprehension redefines ...
+# H101: Use TODO(NAME)
+# H202: assertRaises Exception too broad
+# H232: Python 3.x incompatible octal 000001234 should be written as 0o1234
+# H233: Python 3.x incompatible use of print operator
+# H234: assertEquals is deprecated, use assertEqual
+# H235: assert_ is deprecated, use assertTrue
+# H301: one import per line
+# H306: imports not in alphabetical order (time, os)
+# H401: docstring should not start with a space
+# H403: multi line docstrings should end on a new line
+# H404: multi line docstring should start without a leading new line
+# H405: multi line docstring summary not separated with an empty line
+# H501: Do not use self.__dict__ for string formatting
+# H702: Formatting operation should be outside of localization method call
+# H703: Multiple positional placeholders
+ignore = F402,F812,H101,H202,H232,H233,H234,H235,H301,H306,H401,H403,H404,H405,H501,H702,H703
 exclude = .venv,.tox,dist,doc,*egg
 show-source = True