diff --git a/requirements.txt b/requirements.txt
index 1ba0a998..00a02b92 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ pbr>=1.6 # Apache-2.0
 requests>=2.10.0 # Apache-2.0
 six>=1.9.0 # MIT
 python-keystoneclient!=2.1.0,>=2.0.0 # Apache-2.0
-cliff!=1.16.0,!=1.17.0,>=1.15.0 # Apache-2.0
+cliff>=2.2.0 # Apache-2.0
 oslo.config>=3.14.0 # Apache-2.0
 oslo.i18n>=2.1.0 # Apache-2.0
 oslo.serialization>=1.10.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 6ef223ba..2c514bd6 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,7 +5,7 @@ coverage>=3.6 # Apache-2.0
 discover # BSD
 hacking<0.11,>=0.10.0
 fixtures>=3.0.0 # Apache-2.0/BSD
-requests-mock>=1.0 # Apache-2.0
+requests-mock>=1.1 # Apache-2.0
 mock>=2.0 # BSD
 testrepository>=0.0.18 # Apache-2.0/BSD
 testtools>=1.4.0 # MIT
@@ -14,5 +14,5 @@ nose # LGPL
 python-openstackclient>=2.1.0 # Apache-2.0
 
 # Documentation build requirements
-sphinx!=1.3b1,<1.3,>=1.2.1 # BSD
-oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
+sphinx!=1.3b1,<1.4,>=1.2.1 # BSD
+oslosphinx>=4.7.0 # Apache-2.0