diff --git a/src/tests.yaml b/src/tests.yaml
index e3185c6..4cf93d0 100644
--- a/src/tests.yaml
+++ b/src/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
diff --git a/src/tests/basic_deployment.py b/src/tests/basic_deployment.py
index 8f4c185..1e44e80 100644
--- a/src/tests/basic_deployment.py
+++ b/src/tests/basic_deployment.py
@@ -47,9 +47,10 @@ class DesignateBindDeployment(amulet_deployment.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):
@@ -60,20 +61,34 @@ class DesignateBindDeployment(amulet_deployment.OpenStackAmuletDeployment):
            compatible with the local charm (e.g. stable or next).
            """
         this_service = {'name': 'designate-bind'}
-        other_services = [{'name': 'mysql'},
-                          {'name': 'rabbitmq-server'},
-                          {'name': 'keystone'},
-                          {'name': 'designate'}]
+        other_services = [
+            {'name': 'percona-cluster', 'constraints': {'mem': '3072M'}},
+            {'name': 'rabbitmq-server'},
+            {'name': 'keystone'},
+            {'name': 'designate'}
+        ]
+
+        use_source = [
+            'percona-cluster',
+            'rabbitmq-server',
+        ]
+
+        no_origin = [
+            'designate-bind',
+        ]
+
         super(DesignateBindDeployment, self)._add_services(this_service,
-                                                           other_services)
+                                                           other_services,
+                                                           use_source,
+                                                           no_origin)
 
     def _add_relations(self):
         """Add all of the relations for the services."""
         relations = {
-            'designate:shared-db': 'mysql:shared-db',
+            'designate:shared-db': 'percona-cluster:shared-db',
             'designate:amqp': 'rabbitmq-server:amqp',
             'designate:identity-service': 'keystone:identity-service',
-            'keystone:shared-db': 'mysql:shared-db',
+            'keystone:shared-db': 'percona-cluster:shared-db',
             'designate:dns-backend': 'designate-bind:dns-backend',
         }
         super(DesignateBindDeployment, self)._add_relations(relations)
@@ -90,9 +105,20 @@ class DesignateBindDeployment(amulet_deployment.OpenStackAmuletDeployment):
             keystone_config = {'admin-password': 'openstack',
                                'admin-token': 'ubuntutesting'}
             designate_config = {'nameservers': 'ns1.mojotest.com.'}
+
+        pxc_config = {
+            'dataset-size': '25%',
+            'max-connections': 1000,
+            'root-password': 'ChangeMe123',
+            'sst-password': 'ChangeMe123',
+        }
+
         configs = {
             'keystone': keystone_config,
-            'designate': designate_config}
+            'designate': designate_config,
+            'percona-cluster': pxc_config,
+        }
+
         super(DesignateBindDeployment, self)._configure_services(configs)
 
     def _get_token(self):
@@ -103,7 +129,7 @@ class DesignateBindDeployment(amulet_deployment.OpenStackAmuletDeployment):
         # Access the sentries for inspecting service units
         self.designate_sentry = self.d.sentry['designate'][0]
         self.designate_bind_sentry = self.d.sentry['designate-bind'][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]
         u.log.debug('openstack release val: {}'.format(
diff --git a/src/tests/dev-basic-xenial-newton b/src/tests/gate-basic-xenial-newton
similarity index 100%
rename from src/tests/dev-basic-xenial-newton
rename to src/tests/gate-basic-xenial-newton
diff --git a/src/tests/dev-basic-yakkety-newton b/src/tests/gate-basic-yakkety-newton
old mode 100755
new mode 100644
similarity index 100%
rename from src/tests/dev-basic-yakkety-newton
rename to src/tests/gate-basic-yakkety-newton
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index e3185c6..4cf93d0 100644
--- a/src/tests/tests.yaml
+++ b/src/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