diff --git a/test-requirements.txt b/test-requirements.txt
index ca79689de6..587a9310ae 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -20,7 +20,8 @@ bashate>=0.5.1 # Apache-2.0
 flake8-import-order>=0.13 # LGPLv3
 
 # Doc requirements
-sphinx!=1.6.6,>=1.6.2 # BSD
+sphinx>=1.6.2,!=1.6.6,<2.0.0;python_version=='2.7'  # BSD
+sphinx>=1.6.2,!=1.6.6;python_version>='3.4'  # BSD
 sphinxcontrib-pecanwsme>=0.8.0 # Apache-2.0
 sphinxcontrib-seqdiag>=0.8.4 # BSD
 openstackdocstheme>=1.18.1 # Apache-2.0