diff --git a/charmhelpers/contrib/openstack/amulet/deployment.py b/charmhelpers/contrib/openstack/amulet/deployment.py
index 6fe8cf8..9e0b07f 100644
--- a/charmhelpers/contrib/openstack/amulet/deployment.py
+++ b/charmhelpers/contrib/openstack/amulet/deployment.py
@@ -156,7 +156,7 @@ class OpenStackAmuletDeployment(AmuletDeployment):
         use_source = list(set(
             use_source + ['mysql', 'mongodb', 'rabbitmq-server', 'ceph',
                           'ceph-osd', 'ceph-radosgw', 'ceph-mon',
-                          'ceph-proxy']))
+                          'ceph-proxy', 'percona-cluster', 'lxd']))
 
         # Charms which can not use openstack-origin, ie. many subordinates
         no_origin = list(set(
diff --git a/charmhelpers/contrib/openstack/amulet/utils.py b/charmhelpers/contrib/openstack/amulet/utils.py
index 24b353e..e4546c8 100644
--- a/charmhelpers/contrib/openstack/amulet/utils.py
+++ b/charmhelpers/contrib/openstack/amulet/utils.py
@@ -306,10 +306,8 @@ class OpenStackAmuletUtils(AmuletUtils):
                                   password, tenant):
         """Authenticates admin user with cinder."""
         # NOTE(beisner): cinder python client doesn't accept tokens.
-        service_ip = \
-            keystone_sentry.relation('shared-db',
-                                     'mysql:shared-db')['private-address']
-        ept = "http://{}:5000/v2.0".format(service_ip.strip().decode('utf-8'))
+        keystone_ip = keystone_sentry.info['public-address']
+        ept = "http://{}:5000/v2.0".format(keystone_ip.strip().decode('utf-8'))
         return cinder_client.Client(username, password, tenant, ept)
 
     def authenticate_keystone_admin(self, keystone_sentry, user, password,
@@ -317,10 +315,9 @@ class OpenStackAmuletUtils(AmuletUtils):
                                     keystone_ip=None):
         """Authenticates admin user with the keystone admin endpoint."""
         self.log.debug('Authenticating keystone admin...')
-        unit = keystone_sentry
         if not keystone_ip:
-            keystone_ip = unit.relation('shared-db',
-                                        'mysql:shared-db')['private-address']
+            keystone_ip = keystone_sentry.info['public-address']
+
         base_ep = "http://{}:35357".format(keystone_ip.strip().decode('utf-8'))
         if not api_version or api_version == 2:
             ep = base_ep + "/v2.0"
diff --git a/charmhelpers/contrib/openstack/utils.py b/charmhelpers/contrib/openstack/utils.py
index 9abd4c3..8c89c3a 100644
--- a/charmhelpers/contrib/openstack/utils.py
+++ b/charmhelpers/contrib/openstack/utils.py
@@ -229,6 +229,7 @@ GIT_DEFAULT_REPOS = {
 GIT_DEFAULT_BRANCHES = {
     'liberty': 'stable/liberty',
     'mitaka': 'stable/mitaka',
+    'newton': 'stable/newton',
     'master': 'master',
 }
 
@@ -735,12 +736,12 @@ def git_os_codename_install_source(projects_yaml):
 
         if projects in GIT_DEFAULT_BRANCHES.keys():
             if projects == 'master':
-                return 'newton'
+                return 'ocata'
             return projects
 
         if 'release' in projects:
             if projects['release'] == 'master':
-                return 'newton'
+                return 'ocata'
             return projects['release']
 
     return None
diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py
index 30d9aad..6cdd99c 100644
--- a/tests/basic_deployment.py
+++ b/tests/basic_deployment.py
@@ -45,9 +45,10 @@ class CeilometerBasicDeployment(OpenStackAmuletDeployment):
         self._deploy()
 
         u.log.info('Waiting on extended status checks...')
-        exclude_services = ['mysql', 'mongodb']
+        exclude_services = ['mongodb']
         self._auto_wait_for_status(exclude_services=exclude_services)
 
+        self.d.sentry.wait()
         self._initialize_tests()
 
     def _add_services(self):
@@ -58,13 +59,15 @@ class CeilometerBasicDeployment(OpenStackAmuletDeployment):
            compatible with the local charm (e.g. stable or next).
            """
         this_service = {'name': 'ceilometer'}
-        other_services = [{'name': 'mysql'},
-                          {'name': 'rabbitmq-server'},
-                          {'name': 'keystone'},
-                          {'name': 'mongodb'},
-                          {'name': 'glance'},  # to satisfy workload status
-                          {'name': 'ceilometer-agent'},
-                          {'name': 'nova-compute'}]
+        other_services = [
+            {'name': 'percona-cluster', 'constraints': {'mem': '3072M'}},
+            {'name': 'rabbitmq-server'},
+            {'name': 'keystone'},
+            {'name': 'mongodb'},
+            {'name': 'glance'},  # to satisfy workload status
+            {'name': 'ceilometer-agent'},
+            {'name': 'nova-compute'}
+        ]
         super(CeilometerBasicDeployment, self)._add_services(this_service,
                                                              other_services)
 
@@ -76,14 +79,14 @@ class CeilometerBasicDeployment(OpenStackAmuletDeployment):
             'ceilometer:identity-service': 'keystone:identity-service',
             'ceilometer:identity-notifications': 'keystone:'
                                                  'identity-notifications',
-            'keystone:shared-db': 'mysql:shared-db',
+            'keystone:shared-db': 'percona-cluster:shared-db',
             'ceilometer:ceilometer-service': 'ceilometer-agent:'
                                              'ceilometer-service',
             'nova-compute:nova-ceilometer': 'ceilometer-agent:nova-ceilometer',
-            'nova-compute:shared-db': 'mysql:shared-db',
+            'nova-compute:shared-db': 'percona-cluster:shared-db',
             'nova-compute:amqp': 'rabbitmq-server:amqp',
             'glance:identity-service': 'keystone:identity-service',
-            'glance:shared-db': 'mysql:shared-db',
+            'glance:shared-db': 'percona-cluster:shared-db',
             'glance:amqp': 'rabbitmq-server:amqp',
             'nova-compute:image-service': 'glance:image-service'
         }
@@ -93,7 +96,16 @@ class CeilometerBasicDeployment(OpenStackAmuletDeployment):
         """Configure all of the services."""
         keystone_config = {'admin-password': 'openstack',
                            'admin-token': 'ubuntutesting'}
-        configs = {'keystone': keystone_config}
+        pxc_config = {
+            'dataset-size': '25%',
+            'max-connections': 1000,
+            'root-password': 'ChangeMe123',
+            'sst-password': 'ChangeMe123',
+        }
+        configs = {
+            'keystone': keystone_config,
+            'percona-cluster': pxc_config,
+        }
         super(CeilometerBasicDeployment, self)._configure_services(configs)
 
     def _get_token(self):
@@ -104,7 +116,7 @@ class CeilometerBasicDeployment(OpenStackAmuletDeployment):
         # Access the sentries for inspecting service units
         self.ceil_sentry = self.d.sentry['ceilometer'][0]
         self.ceil_agent_sentry = self.d.sentry['ceilometer-agent'][0]
-        self.mysql_sentry = self.d.sentry['mysql'][0]
+        self.pxc_sentry = self.d.sentry['percona-cluster'][0]
         self.keystone_sentry = self.d.sentry['keystone'][0]
         self.rabbitmq_sentry = self.d.sentry['rabbitmq-server'][0]
         self.mongodb_sentry = self.d.sentry['mongodb'][0]
@@ -604,23 +616,32 @@ class CeilometerBasicDeployment(OpenStackAmuletDeployment):
         # Services which are expected to restart upon config change,
         # and corresponding config files affected by the change
         conf_file = '/etc/ceilometer/ceilometer.conf'
-        services = {
-            'ceilometer-collector': conf_file,
-            'ceilometer-api': conf_file,
-            'ceilometer-agent-notification': conf_file,
-        }
-
-        if self._get_openstack_release() < self.trusty_mitaka:
-            services['ceilometer-alarm-notifier'] = conf_file
-            services['ceilometer-alarm-evaluator'] = conf_file
-
-        if self._get_openstack_release() == self.trusty_liberty or \
-                self._get_openstack_release() >= self.wily_liberty:
-            # Liberty and later
-            services['ceilometer-polling'] = conf_file
+        if self._get_openstack_release() >= self.xenial_newton:
+            services = {
+                'ceilometer-collector - CollectorService(0)': conf_file,
+                'ceilometer-api': conf_file,
+                'ceilometer-polling - AgentManager(0)': conf_file,
+                'ceilometer-agent-notification - NotificationService(0)':
+                    conf_file,
+            }
         else:
-            # Juno and earlier
-            services['ceilometer-agent-central'] = conf_file
+            services = {
+                'ceilometer-collector': conf_file,
+                'ceilometer-api': conf_file,
+                'ceilometer-agent-notification': conf_file,
+            }
+
+            if self._get_openstack_release() < self.trusty_mitaka:
+                services['ceilometer-alarm-notifier'] = conf_file
+                services['ceilometer-alarm-evaluator'] = conf_file
+
+            if self._get_openstack_release() == self.trusty_liberty or \
+                    self._get_openstack_release() >= self.wily_liberty:
+                # Liberty and later
+                services['ceilometer-polling'] = conf_file
+            else:
+                # Juno and earlier
+                services['ceilometer-agent-central'] = conf_file
 
         # Make config change, check for service restarts
         u.log.debug('Making config change on {}...'.format(juju_service))
diff --git a/tests/charmhelpers/contrib/amulet/utils.py b/tests/charmhelpers/contrib/amulet/utils.py
index a39ed4c..8e13ab1 100644
--- a/tests/charmhelpers/contrib/amulet/utils.py
+++ b/tests/charmhelpers/contrib/amulet/utils.py
@@ -546,7 +546,7 @@ class AmuletUtils(object):
             raise if it is present.
         :returns: List of process IDs
         """
-        cmd = 'pidof -x {}'.format(process_name)
+        cmd = 'pidof -x "{}"'.format(process_name)
         if not expect_success:
             cmd += " || exit 0 && exit 1"
         output, code = sentry_unit.run(cmd)
diff --git a/tests/charmhelpers/contrib/openstack/amulet/deployment.py b/tests/charmhelpers/contrib/openstack/amulet/deployment.py
index 6fe8cf8..9e0b07f 100644
--- a/tests/charmhelpers/contrib/openstack/amulet/deployment.py
+++ b/tests/charmhelpers/contrib/openstack/amulet/deployment.py
@@ -156,7 +156,7 @@ class OpenStackAmuletDeployment(AmuletDeployment):
         use_source = list(set(
             use_source + ['mysql', 'mongodb', 'rabbitmq-server', 'ceph',
                           'ceph-osd', 'ceph-radosgw', 'ceph-mon',
-                          'ceph-proxy']))
+                          'ceph-proxy', 'percona-cluster', 'lxd']))
 
         # Charms which can not use openstack-origin, ie. many subordinates
         no_origin = list(set(
diff --git a/tests/charmhelpers/contrib/openstack/amulet/utils.py b/tests/charmhelpers/contrib/openstack/amulet/utils.py
index 24b353e..e4546c8 100644
--- a/tests/charmhelpers/contrib/openstack/amulet/utils.py
+++ b/tests/charmhelpers/contrib/openstack/amulet/utils.py
@@ -306,10 +306,8 @@ class OpenStackAmuletUtils(AmuletUtils):
                                   password, tenant):
         """Authenticates admin user with cinder."""
         # NOTE(beisner): cinder python client doesn't accept tokens.
-        service_ip = \
-            keystone_sentry.relation('shared-db',
-                                     'mysql:shared-db')['private-address']
-        ept = "http://{}:5000/v2.0".format(service_ip.strip().decode('utf-8'))
+        keystone_ip = keystone_sentry.info['public-address']
+        ept = "http://{}:5000/v2.0".format(keystone_ip.strip().decode('utf-8'))
         return cinder_client.Client(username, password, tenant, ept)
 
     def authenticate_keystone_admin(self, keystone_sentry, user, password,
@@ -317,10 +315,9 @@ class OpenStackAmuletUtils(AmuletUtils):
                                     keystone_ip=None):
         """Authenticates admin user with the keystone admin endpoint."""
         self.log.debug('Authenticating keystone admin...')
-        unit = keystone_sentry
         if not keystone_ip:
-            keystone_ip = unit.relation('shared-db',
-                                        'mysql:shared-db')['private-address']
+            keystone_ip = keystone_sentry.info['public-address']
+
         base_ep = "http://{}:35357".format(keystone_ip.strip().decode('utf-8'))
         if not api_version or api_version == 2:
             ep = base_ep + "/v2.0"
diff --git a/tests/gate-basic-precise-icehouse b/tests/gate-basic-precise-icehouse
deleted file mode 100755
index a6a3fe9..0000000
--- a/tests/gate-basic-precise-icehouse
+++ /dev/null
@@ -1,25 +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 ceilometer deployment on precise-icehouse."""
-
-from basic_deployment import CeilometerBasicDeployment
-
-if __name__ == '__main__':
-    deployment = CeilometerBasicDeployment(series='precise',
-                                           openstack='cloud:precise-icehouse',
-                                           source='cloud:precise-updates/icehouse')
-    deployment.run_tests()
diff --git a/tests/dev-basic-xenial-newton b/tests/gate-basic-xenial-newton
similarity index 100%
rename from tests/dev-basic-xenial-newton
rename to tests/gate-basic-xenial-newton
diff --git a/tests/dev-basic-yakkety-newton b/tests/gate-basic-yakkety-newton
old mode 100755
new mode 100644
similarity index 100%
rename from tests/dev-basic-yakkety-newton
rename to tests/gate-basic-yakkety-newton
diff --git a/tests/tests.yaml b/tests/tests.yaml
index e3185c6..4cf93d0 100644
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -1,6 +1,6 @@
 # Bootstrap the model if necessary.
 bootstrap: True
-# Re-use bootstrap node instead of destroying/re-bootstrapping.
+# Re-use bootstrap node.
 reset: True
 # Use tox/requirements to drive the venv instead of bundletester's venv feature.
 virtualenv: False