diff --git a/.gitreview b/.gitreview
new file mode 100644
index 0000000..2ee6bbc
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,4 @@
+[gerrit]
+host=review.opendev.org
+port=29418
+project=openstack/charm-interface-cinder-backend
diff --git a/.zuul.yaml b/.zuul.yaml
new file mode 100644
index 0000000..18efca1
--- /dev/null
+++ b/.zuul.yaml
@@ -0,0 +1,4 @@
+- project:
+    templates:
+      - python35-charm-jobs
+      - openstack-python3-train-jobs
diff --git a/tox.ini b/tox.ini
index 8d5209b..df421c3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,10 @@
 [tox]
 skipsdist = True
 envlist = pep8,py3
-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}
@@ -15,12 +18,18 @@ basepython = python3
 deps = -r{toxinidir}/test-requirements.txt
 commands = ostestr {posargs}
 
+[testenv:py35]
+basepython = python3.5
+deps = -r{toxinidir}/test-requirements.txt
+commands = ostestr {posargs}
+
 [testenv:pep8]
 basepython = python3
 deps = -r{toxinidir}/test-requirements.txt
 commands = flake8 {posargs} .
 
 [testenv:venv]
+basepython = python3
 commands = {posargs}
 
 [flake8]