diff --git a/.zuul.yaml b/.zuul.yaml
new file mode 100644
index 0000000..bddb2c9
--- /dev/null
+++ b/.zuul.yaml
@@ -0,0 +1,13 @@
+---
+- project:
+    templates:
+        - openstack-python-jobs
+        - openstack-python35-jobs
+        - openstack-python36-jobs
+        - openstack-python37-jobs
+    check:
+      jobs:
+        - openstack-tox-pep8
+    gate:
+      jobs:
+        - openstack-tox-pep8
diff --git a/requirements.txt b/requirements.txt
index 8130bed..2abe9b9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,8 @@
 pbr>=0.8
 tortilla>=0.4.1
 Jinja2>=2.7.3
-Sphinx>=1.2.3
+Sphinx>=1.2.3,<2.0; python_version < '3'
+Sphinx>=1.2.3; python_version >= '3'
 docopt>=0.6.2
 simplejson>=3.8.1
 requests>=2.9.1
diff --git a/tox.ini b/tox.ini
index 94104f8..c73e639 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
-minversion = 1.6
-envlist = py36,py35,py27,docs
+minversion = 2.0
+envlist = py36,py35,docs
 skipsdist = True
 
 [testenv]