diff --git a/tests/dev-basic-disco-stein b/tests/gate-basic-disco-stein
similarity index 100%
rename from tests/dev-basic-disco-stein
rename to tests/gate-basic-disco-stein
diff --git a/tox.ini b/tox.ini
index 0aa6ef9a..e37ffd69 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,10 @@
 [tox]
 envlist = pep8,py27,py37
 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}
@@ -15,7 +18,7 @@ install_command =
   pip install {opts} {packages}
 commands = stestr run {posargs}
 whitelist_externals = juju
-passenv = HOME TERM AMULET_* CS_API_*
+passenv = HOME TERM AMULET_* CS_API_* OS_*
 
 [testenv:py27]
 basepython = python2.7