diff --git a/tox.ini b/tox.ini
index 3910292f7..b2aa599eb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 2.0
-envlist = py35,py27,docs,pep8
+envlist = py36,py27,docs,pep8
 skipsdist = True
 
 [testenv]
@@ -52,8 +52,8 @@ commands = sphinx-build -a -E -d releasenotes/build/doctrees -b html releasenote
 basepython = python2.7
 commands = oslo_debug_helper -t bifrost/tests {posargs}
 
-[testenv:debug-py35]
-basepython = python3.5
+[testenv:debug-py36]
+basepython = python3.6
 commands = oslo_debug_helper -t bifrost/tests {posargs}
 
 [flake8]
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index d68c9ba6f..5af7222d9 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -1,6 +1,7 @@
 - project:
     templates:
       - openstack-python-jobs
+      - openstack-python36-jobs
       - check-requirements
       - publish-openstack-docs-pti
       - release-notes-jobs-python3