diff --git a/requirements.txt b/requirements.txt
index 23ac631a..d6fb5b93 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
 cliff>=1.4.3
 jsonschema>=1.3.0,!=1.4.0
-keyring
+keyring>=1.6.1,<2.0
 pbr>=0.5.21,<1.0
-python-keystoneclient>=0.4.1
+python-keystoneclient>=0.3.2
 requests>=1.1
 stevedore>=0.10
diff --git a/setup.py b/setup.py
index 2a0786a8..70c2b3f3 100755
--- a/setup.py
+++ b/setup.py
@@ -18,5 +18,5 @@
 import setuptools
 
 setuptools.setup(
-    setup_requires=['pbr>=0.5.21,<1.0'],
+    setup_requires=['pbr'],
     pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
index 7abec4b2..4857deb3 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,9 +1,9 @@
 coverage>=3.6
 discover
 flake8==2.0
-hacking>=0.5.3,<0.6
+hacking>=0.5.6,<0.8
 mox>=0.5.3
 pep8==1.4.5
-pyflakes==0.7.2
+pyflakes>=0.7.2,<0.7.4
 python-subunit
-testrepository>=0.0.13
+testrepository>=0.0.17