diff --git a/src/tests/gate-basic-disco-stein b/src/tests/gate-basic-disco-stein
new file mode 100755
index 0000000..d2acae6
--- /dev/null
+++ b/src/tests/gate-basic-disco-stein
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+
+"""Amulet tests on a basic barbican deployment on disco-stein."""
+
+from basic_deployment import BarbicanBasicDeployment
+
+if __name__ == '__main__':
+    deployment = BarbicanBasicDeployment(series='disco')
+    deployment.run_tests()
+
diff --git a/src/tox.ini b/src/tox.ini
index 4c5f90e..ffdb931 100644
--- a/src/tox.ini
+++ b/src/tox.ini
@@ -4,6 +4,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/src/wheelhouse.txt b/src/wheelhouse.txt
new file mode 100644
index 0000000..17c1230
--- /dev/null
+++ b/src/wheelhouse.txt
@@ -0,0 +1,3 @@
+
+jinja2
+psutil
diff --git a/tox.ini b/tox.ini
index 53ad564..c6fd536 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,10 @@
 [tox]
 skipsdist = True
 envlist = pep8,py37
-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}