diff --git a/devstack/upgrade/upgrade.sh b/devstack/upgrade/upgrade.sh
index 8653e267eb..a14752c5f4 100755
--- a/devstack/upgrade/upgrade.sh
+++ b/devstack/upgrade/upgrade.sh
@@ -66,13 +66,9 @@ $CEILOMETER_BIN_DIR/ceilometer-upgrade --skip-gnocchi-resource-types || die $LIN
 # Start Ceilometer
 start_ceilometer
 
-# Note these are process names, not service names
-# Note(liamji): Disable the test for
-# "ceilometer-polling --polling-namespaces ipmi". In the test environment,
-# the impi is not ready. The ceilometer-polling should fail.
-ensure_services_started "ceilometer-polling --polling-namespaces compute" \
-                        "ceilometer-polling --polling-namespaces central" \
-                        ceilometer-agent-notification
+# Note(liamji): Disable the test for ceilometer-aipmi.
+# In the test environment, the impi is not ready and the service should fail.
+ensure_services_started ceilometer-acentral ceilometer-acompute ceilometer-anotification
 
 set +o xtrace
 echo "*********************************************************************"