diff --git a/src/tests/bundles/basic.yaml b/src/tests/bundles/bionic-basic.yaml
similarity index 100%
rename from src/tests/bundles/basic.yaml
rename to src/tests/bundles/bionic-basic.yaml
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index 84b6062..4adca6a 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -4,7 +4,7 @@ tests:
 configure:
   - zaza.charm_tests.noop.setup.basic_setup
 gate_bundles:
-  - basic
+  - bionic-basic
 smoke_bundles:
-  - basic
+  - bionic-basic
 
diff --git a/src/tox.ini b/src/tox.ini
index cd35f5c..627cdfa 100644
--- a/src/tox.ini
+++ b/src/tox.ini
@@ -1,6 +1,10 @@
 [tox]
 envlist = pep8
 skipsdist = 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}
diff --git a/tox.ini b/tox.ini
index 0de9145..da3acf7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,6 +4,10 @@
 [tox]
 skipsdist = True
 envlist = pep8,py37
+# 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}