diff --git a/requirements.txt b/requirements.txt
index 4e473fbd7..8f6e5e778 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,28 +2,27 @@ pbr>=0.6,!=0.7,<1.0
 
 Paste
 PasteDeploy>=1.5.0
-Routes>=1.12.3
+Routes>=1.12.3,!=2.0
 anyjson>=0.3.3
 argparse
 Babel>=1.3
-eventlet>=0.13.0
+eventlet>=0.16.1,!=0.17.0
 greenlet>=0.3.2
 httplib2>=0.7.5
-requests>=1.1
+requests>=2.2.0,!=2.4.0
 iso8601>=0.1.9
 jsonrpclib
-Jinja2
-kombu>=2.4.8
-netaddr>=0.7.6
+Jinja2>=2.6  # BSD License (3 clause)
+kombu>=2.5.0
+netaddr>=0.7.12
 #python-tackerclient>=2.3.4,<3
-SQLAlchemy>=0.7.8,<=0.9.99
+SQLAlchemy>=0.9.7,<=0.9.99
 WebOb>=1.2.3
-python-keystoneclient>=0.9.0
-alembic>=0.4.1
-six>=1.7.0
-stevedore>=0.14
-oslo.config>=1.2.1
-oslo.messaging>=1.3.0
-oslo.rootwrap
-
-python-novaclient>=2.17.0
+python-keystoneclient>=1.1.0
+alembic>=0.7.2
+six>=1.9.0
+stevedore>=1.3.0,<1.4.0  # Apache-2.0
+oslo.config>=1.9.3,<1.10.0  # Apache-2.0
+oslo.messaging>=1.8.0,<1.9.0  # Apache-2.0
+oslo.rootwrap>=1.6.0,<1.7.0  # Apache-2.0
+python-novaclient>=2.22.0
diff --git a/test-requirements.txt b/test-requirements.txt
index bb716425e..e1f8477e1 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,18 +1,14 @@
 hacking>=0.9.2,<0.10
 
-cliff>=1.4.3
+cliff>=1.10.0,<1.11.0  # Apache-2.0
 coverage>=3.6
 discover
 fixtures>=0.3.14
 mock>=1.0
 python-subunit>=0.0.18
 ordereddict
-sphinx>=1.1.2,!=1.2.0,<1.3
-oslosphinx
+sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
+oslosphinx>=2.5.0,<2.6.0  # Apache-2.0
 testrepository>=0.0.18
-testtools>=0.9.34
+testtools>=0.9.36,!=1.2.0
 WebTest>=2.0
-# Packages for the Cisco Plugin
-###############################
-configobj
-###############################