diff --git a/doc/requirements.txt b/doc/requirements.txt
index a4da2a28ed..e647310699 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -4,5 +4,6 @@
 openstackdocstheme>=1.18.1 # Apache-2.0
 osprofiler>=1.4.0 # Apache-2.0
 os-api-ref>=1.4.0 # Apache-2.0
-sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD
 reno>=2.5.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 209b0c4b9e..ff04da1211 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,7 +5,7 @@
 # Despite above warning added by global sync process, please use
 # ascii betical order.
 
-bandit>=1.1.0 # Apache-2.0
+bandit!=1.6.0,>=1.1.0 # Apache-2.0
 bashate>=0.5.1 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
 doc8>=0.6.0 # Apache-2.0
@@ -17,7 +17,8 @@ osprofiler>=1.4.0 # Apache-2.0
 os-testr>=1.0.0 # Apache-2.0
 python-subunit>=1.0.0 # Apache-2.0/BSD
 pytz>=2013.6 # MIT
-sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD
 testrepository>=0.0.18 # Apache-2.0/BSD
 stestr>=2.0.0 # Apache-2.0
 testscenarios>=0.4 # Apache-2.0/BSD