diff --git a/doc/requirements.txt b/doc/requirements.txt
index 6e62d8da..bf40912d 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -6,7 +6,8 @@
 doc8>=0.6.0 # Apache-2.0
 openstackdocstheme>=1.18.1 # Apache-2.0
 reno>=2.5.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,<2.0.0;python_version=='2.7' # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4'  # BSD
 sphinxcontrib-apidoc>=0.2.0  # BSD
 
 # For autodoc builds
diff --git a/test-requirements.txt b/test-requirements.txt
index 37d5c379..6ca0c432 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -20,4 +20,4 @@ WebTest>=2.0.27 # MIT
 oslo.messaging>=5.29.0 # Apache-2.0
 
 # Bandit security code scanner
-bandit>=1.1.0 # Apache-2.0
+bandit!=1.6.0,>=1.1.0 # Apache-2.0