diff --git a/.zuul.yaml b/.zuul.yaml
index aa9c508f..7051aeeb 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,4 +1,3 @@
 - project:
     templates:
-      - python-charm-jobs
-      - openstack-python35-jobs-nonvoting
+      - python35-charm-jobs
diff --git a/tox.ini b/tox.ini
index 3fa366a8..a759b529 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,8 +2,9 @@
 # This file is managed centrally by release-tools and should not be modified
 # within individual charm repos.
 [tox]
-envlist = pep8,py27
+envlist = pep8,py27,py35,py36
 skipsdist = True
+skip_missing_interpreters = True
 
 [testenv]
 setenv = VIRTUAL_ENV={envdir}