diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml
index e2412c6e1d..34210a1a73 100644
--- a/.zuul.d/project.yaml
+++ b/.zuul.d/project.yaml
@@ -1,5 +1,7 @@
 ---
 - project:
+    templates:
+      - openstack-python36-jobs
     check:
       jobs:
         - openstack-tox-lower-constraints
diff --git a/tox.ini b/tox.ini
index f9336938bb..d0d9e364d6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 minversion = 1.6
 skipsdist = True
-envlist = py35,py27,pep8,pypy
+envlist = py36,py35,py27,pep8,pypy
 
 [testenv]
 usedevelop=True