diff --git a/requirements.txt b/requirements.txt
index c756cfe..d2deb98 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,2 @@
 six
-pbr>=0.8.2,<1.0
+pbr>=0.8.2,<2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 056f039..c4df181 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,6 +1,6 @@
 coverage>=3.6
 discover
-hacking>=0.5.6,<0.8
+hacking>=0.5.6,<0.11
 mock
 unittest2
 python-subunit
diff --git a/tox.ini b/tox.ini
index 036ee40..0f23aa3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -36,6 +36,9 @@ commands = {posargs}
 
 [flake8]
 ; E501 line too long (80 > 79 characters)
-ignore = E501
+; H301 one import per line
+; H405 multi line docstring summary not separated with an empty line
+; H501 Do not use locals() for string formatting
+ignore = E501,H301,H405,H501
 show-source = True
 exclude = .venv,.tox,dist,doc,build,*.egg