diff --git a/src/tests/basic_deployment.py b/src/tests/basic_deployment.py
index 05437ed5f59a529b22b33a3b1047996afae5dd80..6dcd08813353f7ecaebbde18276f926d5aa81fc3 100644
--- a/src/tests/basic_deployment.py
+++ b/src/tests/basic_deployment.py
@@ -49,15 +49,13 @@ class GnocchiCharmDeployment(amulet_deployment.OpenStackAmuletDeployment):
 
         u.log.info('Waiting on extended status checks...')
         self.exclude_services = ['mysql', '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")
+        # 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._initialize_tests()
-        if self._get_openstack_release() >= self.xenial_pike:
-            self.run_ceilometer_upgrade_action()
+        self.run_ceilometer_upgrade_action()
 
     def _add_services(self):
         """Add services