diff --git a/doc/requirements.txt b/doc/requirements.txt
index b9c5e1f1..711fb972 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,3 +1,4 @@
-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
 reno>=2.5.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 70e4ca04..c30a2b17 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -14,5 +14,6 @@ virtualenv>=14.0.6 # MIT
 coverage!=4.4,>=4.0 # Apache-2.0
 
 # optionally exposed by distutils commands
-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
 testrepository>=0.0.18 # Apache-2.0/BSD