diff --git a/src/tests/dev-basic-bionic-queens b/src/tests/gate-basic-bionic-queens
similarity index 100%
rename from src/tests/dev-basic-bionic-queens
rename to src/tests/gate-basic-bionic-queens
diff --git a/src/tests/gate-basic-xenial-mitaka b/src/tests/gate-basic-xenial-mitaka
deleted file mode 100644
index 3783f98..0000000
--- a/src/tests/gate-basic-xenial-mitaka
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2016 Canonical Ltd
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#  http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""Amulet tests on a basic Gnocchi Charm deployment on xenial-mitaka."""
-
-from basic_deployment import GnocchiCharmDeployment
-
-if __name__ == '__main__':
-    deployment = GnocchiCharmDeployment(series='xenial')
-    deployment.run_tests()
diff --git a/src/tox.ini b/src/tox.ini
index 9b0e710..f498279 100644
--- a/src/tox.ini
+++ b/src/tox.ini
@@ -35,7 +35,7 @@ commands =
 # 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-pike --no-destroy
+    bundletester -vl DEBUG -r json -o func-results.json gate-basic-xenial-queens --no-destroy
 
 [testenv:func27-dfs]
 # Run all deploy-from-source tests which are +x (may not always pass!)