diff --git a/.zuul.yaml b/.zuul.yaml
index 5f49dab5..881357e6 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -3,11 +3,8 @@
       - check-requirements
       - designate-devstack-jobs
       - openstack-cover-jobs
-      - openstack-lower-constraints-jobs
       - openstack-python-jobs
       - openstack-python35-jobs
       - openstack-python36-jobs
       - openstackclient-plugin-jobs
       - publish-openstack-docs-pti
-    gate:
-      queue: designate
diff --git a/doc/requirements.txt b/doc/requirements.txt
index 827758f0..68773f5b 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.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