diff --git a/test-requirements.txt b/test-requirements.txt
index db2d588b0..00bd64dae 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,7 +5,7 @@
 coverage>=4.0 # Apache-2.0
 doc8 # Apache-2.0
 freezegun>=0.3.6 # Apache-2.0
-hacking<0.11,>=0.10.2
+hacking>=0.12.0,!=0.13.0,<0.14  # Apache-2.0
 mock>=2.0 # BSD
 oslotest>=1.10.0 # Apache-2.0
 os-testr>=0.8.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index bbc57f1a5..67d3d9147 100644
--- a/tox.ini
+++ b/tox.ini
@@ -45,7 +45,7 @@ commands =
 
 [flake8]
 show-source=True
-ignore=
+ignore= H105,E123,E226
 builtins= _
 exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,*sqlalchemy/alembic/versions/*,demo/,releasenotes