diff --git a/src/tests/basic_deployment.py b/src/tests/basic_deployment.py
index ebe535f..d0d1c48 100644
--- a/src/tests/basic_deployment.py
+++ b/src/tests/basic_deployment.py
@@ -122,26 +122,12 @@ class KeystoneLDAPCharmDeployment(amulet_deployment.OpenStackAmuletDeployment):
         self.keystone_ip = self.keystone_sentry.relation(
             'shared-db',
             'percona-cluster:shared-db')['private-address']
-        # Authenticate admin with keystone endpoint
-        self.keystone = self.get_keystone_client(api_version=3)
 
-    def get_keystone_client(self, api_version=None, keystone_ip=None):
-        if keystone_ip is None:
-            keystone_ip = self.keystone_ip
-        if api_version == 2:
-            return u.authenticate_keystone_admin(self.keystone_sentry,
-                                                 user='admin',
-                                                 password='openstack',
-                                                 tenant='admin',
-                                                 api_version=api_version,
-                                                 keystone_ip=keystone_ip)
-        else:
-            return u.authenticate_keystone_admin(self.keystone_sentry,
-                                                 user='admin',
-                                                 password='openstack',
-                                                 project_name='admin',
-                                                 api_version=api_version,
-                                                 keystone_ip=keystone_ip)
+        # Authenticate admin with keystone
+        self.keystone_session, self.keystone = u.get_default_keystone_session(
+            self.keystone_sentry,
+            openstack_release=self._get_openstack_release(),
+            api_version=3)
 
     def find_keystone_v3_user(self, client, username, domain):
         """Find a user within a specified keystone v3 domain"""
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/tox.ini b/src/tox.ini
index 6ca8ba2..628b390 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-bionic-queens --no-destroy
 
 [testenv:func27-dfs]
 # Run all deploy-from-source tests which are +x (may not always pass!)