diff --git a/requirements.txt b/requirements.txt
index 7dc14c33..77e16bd5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@
 # process, which may cause wedges in the gate later.
 pbr>=1.6
 Babel>=1.3
-cliff>=1.14.0 # Apache-2.0
+cliff>=1.15.0 # Apache-2.0
 PyYAML>=3.1.0
 python-dateutil>=2.4.2
 six>=1.9.0
diff --git a/setup.py b/setup.py
index d8080d05..782bb21f 100644
--- a/setup.py
+++ b/setup.py
@@ -25,5 +25,5 @@ except ImportError:
     pass
 
 setuptools.setup(
-    setup_requires=['pbr>=1.3'],
+    setup_requires=['pbr>=1.8'],
     pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
index 08dc3e7f..c4dc2b96 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,8 +5,8 @@ hacking<0.11,>=0.10.0
 coverage>=3.6
 discover
 fixtures>=1.3.1
-oslotest>=1.7.0 # Apache-2.0
-oslosphinx>=2.5.0 # Apache-2.0
+oslotest>=1.10.0 # Apache-2.0
+oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
 python-subunit>=0.0.18
 sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
 testrepository>=0.0.18