diff --git a/manifests/profile/pacemaker/rabbitmq.pp b/manifests/profile/pacemaker/rabbitmq.pp
index 1881e580d..8c4d57a1f 100644
--- a/manifests/profile/pacemaker/rabbitmq.pp
+++ b/manifests/profile/pacemaker/rabbitmq.pp
@@ -151,7 +151,7 @@ class tripleo::profile::pacemaker::rabbitmq (
       # replicated around the cluster
       exec { 'rabbitmq-ready':
         path        => '/usr/sbin:/usr/bin:/sbin:/bin',
-        command     => 'rabbitmqctl status | grep -F "{rabbit,"',
+        command     => 'rabbitmqctl eval "lists:keymember(rabbit, 1, application:which_applications())." | grep -q true',
         timeout     => 30,
         tries       => 180,
         try_sleep   => 10,
diff --git a/manifests/profile/pacemaker/rabbitmq_bundle.pp b/manifests/profile/pacemaker/rabbitmq_bundle.pp
index f511cf7de..163514320 100644
--- a/manifests/profile/pacemaker/rabbitmq_bundle.pp
+++ b/manifests/profile/pacemaker/rabbitmq_bundle.pp
@@ -341,7 +341,7 @@ class tripleo::profile::pacemaker::rabbitmq_bundle (
       }
 
       if size($rabbit_nodes) == 1 {
-        $check_command = 'rabbitmqctl status | grep -F "{rabbit,"'
+        $check_command = 'rabbitmqctl eval "lists:keymember(rabbit, 1, application:which_applications())." | grep -q true'
       } else {
         # This grep makes sure the rabbit app in erlang is up and running
         # which is enough to guarantee that the user will eventually get