diff --git a/.zuul.yaml b/.zuul.yaml
index c59a67f..8b2dc99 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,16 +1,11 @@
 - project:
     templates:
-      - check-requirements
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-to-pypi
     check:
       jobs:
-        - build-openstack-sphinx-docs:
+        - tox-docs:
             voting: false
         - requirements-check:
             voting: false
-    gate:
-      jobs:
-        - requirements-check:
-            voting: false
diff --git a/test-requirements.txt b/test-requirements.txt
index c9dbbe5..577bde4 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,6 +2,7 @@ flake8
 github3.py
 hacking
 mock
-sphinx>=1.6.5
+sphinx>=1.6.5,<2.0.0;python_version=='2.7'  # BSD
+sphinx>=1.6.5;python_version>='3.4'  # BSD
 stestr>=1.0.0
 testtools>=2.2.0