diff --git a/.zuul.yaml b/.zuul.yaml
index d3a65289..4bc90afa 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,6 +1,7 @@
 - project:
     templates:
       - openstack-python-jobs
+      - openstack-python36-jobs
       - openstack-python35-jobs-nonvoting
       - check-requirements
       - publish-openstack-docs-pti
diff --git a/tox.ini b/tox.ini
index 98e0d0c0..3665fa69 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