diff --git a/src/tests/gate-basic-xenial-mitaka-keystone-v2 b/src/tests/gate-basic-xenial-mitaka
similarity index 100%
rename from src/tests/gate-basic-xenial-mitaka-keystone-v2
rename to src/tests/gate-basic-xenial-mitaka
diff --git a/src/tox.ini b/src/tox.ini
index b608ad3..479d7bb 100644
--- a/src/tox.ini
+++ b/src/tox.ini
@@ -1,13 +1,16 @@
+# Source charm: ./src/tox.ini
+# This file is managed centrally by release-tools and should not be modified
+# within individual charm repos.
 [tox]
 envlist = pep8
 skipsdist = True
 
 [testenv]
-envdir = .tox/py27
 setenv = VIRTUAL_ENV={envdir}
          PYTHONHASHSEED=0
          AMULET_SETUP_TIMEOUT=2700
-passenv = HOME TERM AMULET_HTTP_PROXY AMULET_OS_VIP
+whitelist_externals = juju
+passenv = HOME TERM AMULET_*
 deps = -r{toxinidir}/test-requirements.txt
 install_command =
   pip install --allow-unverified python-apt {opts} {packages}
@@ -23,28 +26,24 @@ commands =
     bundletester -vl DEBUG -r json -o func-results.json --test-pattern "gate-*" -n --no-destroy
 
 [testenv:func27]
-# Charm Functional Test
 # Run all gate tests which are +x (expected to always pass)
 basepython = python2.7
 commands =
     bundletester -vl DEBUG -r json -o func-results.json --test-pattern "gate-*" --no-destroy
 
 [testenv:func27-smoke]
-# Charm Functional Test
 # Run a specific test as an Amulet smoke test (expected to always pass)
 basepython = python2.7
 commands =
-    bundletester -vl DEBUG -r json -o func-results.json gate-basic-xenial-mitaka-keystone-v2 --no-destroy
+    bundletester -vl DEBUG -r json -o func-results.json gate-basic-xenial-mitaka --no-destroy
 
 [testenv:func27-dfs]
-# Charm Functional Test
 # Run all deploy-from-source tests which are +x (may not always pass!)
 basepython = python2.7
 commands =
     bundletester -vl DEBUG -r json -o func-results.json --test-pattern "dfs-*" --no-destroy
 
 [testenv:func27-dev]
-# Charm Functional Test
 # Run all development test targets which are +x (may not always pass!)
 basepython = python2.7
 commands =
diff --git a/tox.ini b/tox.ini
index df765e0..893f30f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,3 +1,6 @@
+# Source charm: ./tox.ini
+# This file is managed centrally by release-tools and should not be modified
+# within individual charm repos.
 [tox]
 skipsdist = True
 envlist = pep8,py34,py35
@@ -7,7 +10,6 @@ skip_missing_interpreters = True
 setenv = VIRTUAL_ENV={envdir}
          PYTHONHASHSEED=0
          TERM=linux
-         INTERFACE_PATH={toxinidir}/interfaces
          LAYER_PATH={toxinidir}/layers
          INTERFACE_PATH={toxinidir}/interfaces
          JUJU_REPOSITORY={toxinidir}/build