diff --git a/test-requirements.txt b/test-requirements.txt
index cde81436b..110c1f29e 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>=3.1.0,<3.2.0 # Apache-2.0
+hacking>=7.0.0,<7.1.0 # Apache-2.0
 coverage>=4.0 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
 mock>=2.0,<4.0 # BSD
diff --git a/tox.ini b/tox.ini
index e9338f63e..9e9db1b5d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -38,7 +38,8 @@ commands = python setup.py build_sphinx
 
 [flake8]
 # E123, E125 skipped as they are invalid PEP-8
-ignore = W605, W503, W504, E731
+# H216 ignored until we drop third-party mock library
+ignore = W605, W503, W504, E731, H216
 show-source = true
 builtins = _
 exclude=.venv*,.git,.tox,dist,doc,*lib/python*,*egg,tools,build