diff --git a/.zuul.yaml b/.zuul.yaml
index 29048178c..7d87e7928 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -3,6 +3,7 @@
       - docs-on-readthedocs
       - openstack-python-jobs
       - openstack-python35-jobs
+      - openstack-python36-jobs
     vars:
       rtd_webhook_id: '47123'
     check:
diff --git a/tox.ini b/tox.ini
index 5c06161a6..56db97b76 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py35,py27,pep8,docs
+envlist = py36,py35,py27,pep8,docs
 minversion = 2.0
 skipsdist = True