diff --git a/.zuul.yaml b/.zuul.yaml
new file mode 100644
index 0000000..8057c6c
--- /dev/null
+++ b/.zuul.yaml
@@ -0,0 +1,5 @@
+- project:
+    templates:
+      - python35-charm-jobs
+      - openstack-python3-train-jobs
+
diff --git a/tox.ini b/tox.ini
index b3b4743..923b7ae 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,10 @@
 [tox]
 envlist = pep8,py27,py34,py35
 skipsdist = True
-skip_missing_interpreters = True
+# NOTE(beisner): Avoid build/test env pollution by not enabling sitepackages.
+sitepackages = False
+# NOTE(beisner): Avoid false positives by not skipping missing interpreters.
+skip_missing_interpreters = False
 
 [testenv]
 setenv = VIRTUAL_ENV={envdir}
@@ -28,6 +31,18 @@ deps = -r{toxinidir}/test-requirements.txt
 # TODO: Need to write unit tests then remove the following command.
 commands = /bin/true
 
+[testenv:py36]
+basepython = python3.6
+deps = -r{toxinidir}/test-requirements.txt
+# TODO: Need to write unit tests then remove the following command.
+commands = /bin/true
+
+[testenv:py37]
+basepython = python3.7
+deps = -r{toxinidir}/test-requirements.txt
+# TODO: Need to write unit tests then remove the following command.
+commands = /bin/true
+
 [testenv:pep8]
 basepython = python2.7
 deps = -r{toxinidir}/test-requirements.txt