diff --git a/test-requirements.txt b/test-requirements.txt
index 0b114859..2c5c4e20 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -14,5 +14,6 @@ testtools>=2.2.0 # MIT
 
 # Doc requirements
 doc8>=0.6.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
 openstackdocstheme>=1.18.1 # Apache-2.0