diff --git a/rebuild b/rebuild
index ada580d..9d3b129 100644
--- a/rebuild
+++ b/rebuild
@@ -2,4 +2,4 @@
 # when dependencies of the charm change,
 # but nothing in the charm needs to.
 # simply change the uuid to something new
-85c5499c-1a79-11e9-8864-470f2a69c15e
+47685d4e-267f-11e9-b663-67c5a27a488e
diff --git a/src/tests/basic_deployment.py b/src/tests/basic_deployment.py
index d6a169f..a532d12 100644
--- a/src/tests/basic_deployment.py
+++ b/src/tests/basic_deployment.py
@@ -34,11 +34,17 @@ class AodhBasicDeployment(OpenStackAmuletDeployment):
         self._deploy()
 
         u.log.info('Waiting on extended status checks...')
-        exclude_services = ['mongodb', 'memcached']
-        self._auto_wait_for_status(exclude_services=exclude_services)
+        self.exclude_services = ['mongodb', 'memcached']
+        if self._get_openstack_release() >= self.xenial_pike:
+            # Ceilometer will come up blocked until the ceilometer-upgrade
+            # action is run
+            self.exclude_services.append("ceilometer")
+        self._auto_wait_for_status(exclude_services=self.exclude_services)
 
         self.d.sentry.wait()
         self._initialize_tests()
+        if self._get_openstack_release() >= self.xenial_pike:
+            self.run_ceilometer_upgrade_action()
 
     def _add_services(self):
         """Add services
@@ -170,6 +176,23 @@ class AodhBasicDeployment(OpenStackAmuletDeployment):
                 return False
             time.sleep(2)
 
+    def run_ceilometer_upgrade_action(self):
+        """Run ceilometer-upgrade
+
+        This action will be run early to initialize ceilometer
+        when gnocchi is related.
+        Ceilometer will be in a blocked state until this runs.
+        """
+        u.log.debug('Checking ceilometer-upgrade')
+        unit = self.ceil_sentry
+
+        action_id = unit.run_action("ceilometer-upgrade")
+        assert u.wait_on_action(action_id), "ceilometer-upgrade action failed"
+        # Wait for acivte Unit is ready on ceilometer
+        self.exclude_services.remove('ceilometer')
+        self._auto_wait_for_status(exclude_services=self.exclude_services)
+        u.log.debug('OK')
+
     def test_100_services(self):
         """Verify the expected services are running on the corresponding
            service units."""