diff --git a/doc/requirements.txt b/doc/requirements.txt
index 827758f..11aeec7 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,5 +1,6 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.3,<2.0.0;python_version=='2.7'  # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.3;python_version>='3.4'  # BSD
 openstackdocstheme>=1.18.1 # Apache-2.0
diff --git a/lower-constraints.txt b/lower-constraints.txt
index 3ce4edc..9fd6f44 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -63,7 +63,7 @@ rfc3986==0.3.1
 simplejson==3.5.1
 six==1.10.0
 snowballstemmer==1.2.1
-Sphinx==1.6.2
+Sphinx==1.6.3
 sphinxcontrib-websupport==1.0.1
 stevedore==1.20.0
 tempest==17.1.0
diff --git a/setup.cfg b/setup.cfg
index 9007dbd..6599548 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -50,9 +50,6 @@ test =
   tempest>=17.1.0 # Apache-2.0
   testrepository>=0.0.18 # Apache-2.0/BSD
   testtools>=2.2.0 # MIT
-doc =
-  sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
-  oslosphinx>=4.7.0 # Apache-2.0
 
 [wheel]
 universal = 1