diff --git a/requirements.txt b/requirements.txt
index 5b913db80..bf82ffa65 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,7 +7,7 @@ Babel>=2.3.4 # BSD
 falcon>=0.1.6 # Apache-2.0
 jsonschema!=2.5.0,<3.0.0,>=2.0.0 # MIT
 iso8601>=0.1.11 # MIT
-keystonemiddleware!=4.1.0,!=4.5.0,>=4.0.0 # Apache-2.0
+keystonemiddleware!=4.5.0,>=4.2.0 # Apache-2.0
 msgpack-python>=0.4.0 # Apache-2.0
 python-memcached>=1.56 # PSF
 WebOb>=1.2.3 # MIT
@@ -17,10 +17,10 @@ oslo.cache>=1.5.0 # Apache-2.0
 oslo.config>=3.14.0 # Apache-2.0
 oslo.context>=2.9.0 # Apache-2.0
 oslo.i18n>=2.1.0 # Apache-2.0
-oslo.log>=1.14.0 # Apache-2.0
+oslo.log>=3.11.0 # Apache-2.0
 oslo.serialization>=1.10.0 # Apache-2.0
 oslo.utils>=3.16.0 # Apache-2.0
-oslo.policy>=1.9.0 # Apache-2.0
+oslo.policy>=1.14.0 # Apache-2.0
 SQLAlchemy<1.1.0,>=1.0.10 # MIT
 enum34;python_version=='2.7' or python_version=='2.6' or python_version=='3.3' # BSD
 trollius>=1.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 93fe25839..cd3792ab6 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -21,8 +21,8 @@ testrepository>=0.0.18 # Apache-2.0/BSD
 testtools>=1.4.0 # MIT
 
 # Documentation
-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
 openstackdocstheme>=1.5.0 # Apache-2.0
 oslotest>=1.10.0 # Apache-2.0
 reno>=1.8.0 # Apache2