diff --git a/requirements.txt b/requirements.txt
index a46e8e32d..a4bfbc958 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,23 +9,24 @@ greenlet>=0.3.2
 iso8601>=0.1.9
 Jinja2>=2.6 # BSD License (3 clause)
 jsonschema!=2.5.0,<3.0.0,>=2.0.0
-keystonemiddleware>=1.5.0
+keystonemiddleware>=2.0.0
 netaddr>=0.7.12
 oslo.config>=1.11.0 # Apache-2.0
 oslo.concurrency>=2.1.0 # Apache-2.0
-oslo.messaging!=1.12.0,>=1.8.0 # Apache-2.0
-oslo.middleware!=2.0.0,>=1.2.0 # Apache-2.0
-oslo.log>=1.2.0 # Apache-2.0
+oslo.messaging>=1.16.0 # Apache-2.0
+oslo.middleware>=2.4.0 # Apache-2.0
+oslo.log>=1.6.0 # Apache-2.0
 oslo.rootwrap>=2.0.0 # Apache-2.0
 oslo.serialization>=1.4.0 # Apache-2.0
 oslo.service>=0.1.0 # Apache-2.0
-oslo.utils>=1.6.0 # Apache-2.0
+oslo.utils>=1.9.0 # Apache-2.0
 Paste
 PasteDeploy>=1.5.0
-pbr<2.0,>=0.11
+pbr<2.0,>=1.3
 pecan>=0.8.0
 python-neutronclient<3,>=2.3.11
-Routes!=2.0,!=2.1,>=1.12.3
+Routes!=2.0,!=2.1,>=1.12.3;python_version=='2.7'
+Routes!=2.0,>=1.12.3;python_version!='2.7'
 requests>=2.5.2
 six>=1.9.0
 SQLAlchemy<1.1.0,>=0.9.7
diff --git a/setup.py b/setup.py
index 056c16c2b..d8080d05c 100644
--- a/setup.py
+++ b/setup.py
@@ -25,5 +25,5 @@ except ImportError:
     pass
 
 setuptools.setup(
-    setup_requires=['pbr'],
+    setup_requires=['pbr>=1.3'],
     pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
index e05fa62cd..01e48d683 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,8 +7,9 @@ hacking<0.10,>=0.9.2
 coverage>=3.6
 discover
 fixtures>=1.3.1
-mock>=1.0
-oslotest>=1.5.1 # Apache-2.0
+mock!=1.1.4,>=1.1;python_version!='2.6'
+mock==1.0.1;python_version=='2.6'
+oslotest>=1.7.0 # Apache-2.0
 oslosphinx>=2.5.0 # Apache-2.0
 python-subunit>=0.0.18
 requests-mock>=0.6.0 # Apache-2.0