diff --git a/test-requirements.txt b/test-requirements.txt
index e701ce80..a169b538 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -12,9 +12,10 @@ coverage!=4.4,>=4.0 # Apache-2.0
 
 # These are needed for docs generation
 openstackdocstheme>=1.18.1 # Apache-2.0
-sphinx!=1.6.6,!=1.6.7,>=1.6.5 # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.5,<2.0.0;python_version=='2.7' # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.5;python_version>='3.4' # BSD
 
 reno>=2.5.0 # Apache-2.0
 
 # Bandit security code scanner
-bandit>=1.1.0 # Apache-2.0
+bandit>=1.1.0,<1.6.0 # Apache-2.0