diff --git a/requirements.txt b/requirements.txt
index 65819ff27..23b3b5b58 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -15,14 +15,14 @@ jsonrpclib
 Jinja2
 kombu>=2.4.8
 netaddr>=0.7.6
-python-neutronclient>=2.3.4,<3
+python-neutronclient>=2.3.4,<2.4
 SQLAlchemy>=0.7.8,!=0.9.5,<=0.9.99
 WebOb>=1.2.3
-python-keystoneclient>=0.7.0
+python-keystoneclient>=0.7.0,<0.12
 alembic>=0.4.1
 six>=1.6.0
-stevedore>=0.14
-oslo.config>=1.2.0
-oslo.rootwrap
+stevedore>=0.14,<1.2
+oslo.config>=1.2.0,<1.5
+oslo.rootwrap<1.4
 
-python-novaclient>=2.17.0
+python-novaclient>=2.17.0,<2.21
diff --git a/test-requirements.txt b/test-requirements.txt
index 272b11655..7f40b25c7 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,6 +1,6 @@
 hacking>=0.8.0,<0.9
 
-cliff>=1.4.3
+cliff>=1.4.3,<1.9
 coverage>=3.6
 discover
 fixtures>=0.3.14
@@ -9,7 +9,7 @@ python-subunit>=0.0.18
 ordereddict
 sphinx>=1.1.2,<1.1.999
 testrepository>=0.0.18
-testtools>=0.9.34
+testtools>=0.9.34,!=1.2.0,!=1.4.0
 WebTest>=2.0
 # Packages for the Cisco Plugin
 ###############################