diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py
index 435a9dd..b367441 100644
--- a/tests/basic_deployment.py
+++ b/tests/basic_deployment.py
@@ -77,7 +77,8 @@ class CeilometerBasicDeployment(OpenStackAmuletDeployment):
         if self._get_openstack_release() >= self.xenial_pike:
             other_services.extend([
                 {'name': 'gnocchi'},
-                {'name': 'memcached', 'location': 'cs:memcached'},
+                {'name': 'memcached',
+                 'location': 'cs:~memcached-team/memcached'},
                 {'name': 'ceph-mon', 'units': 3},
                 {'name': 'ceph-osd', 'units': 3,
                  'storage': {'osd-devices': 'cinder,10G'}}])
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 ed43a0e..0a93577 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,6 +4,10 @@
 [tox]
 envlist = pep8,py37
 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}