diff --git a/.zuul.yaml b/.zuul.yaml
index 305cc892..0830544f 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -4,5 +4,4 @@
       - openstack-python35-jobs
       - check-requirements
       - release-notes-jobs
-    gate:
-      queue: os-win
+    queue: os-win
diff --git a/test-requirements.txt b/test-requirements.txt
index b8937f8f..8fd88f18 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -8,7 +8,8 @@ coverage!=4.4,>=4.0 # Apache-2.0
 ddt>=1.0.1 # MIT
 python-subunit>=1.0.0 # Apache-2.0/BSD
 docutils>=0.11 # OSI-Approved Open Source, Public Domain
-sphinx!=1.6.6,>=1.6.2 # BSD
+sphinx>=1.6.2,!=1.6.6,<2.0.0;python_version=='2.7'  # BSD
+sphinx>=1.6.2,!=1.6.6;python_version>='3.4'  # BSD
 oslo.config>=5.1.0 # Apache-2.0
 oslotest>=3.2.0 # Apache-2.0
 testrepository>=0.0.18 # Apache-2.0/BSD