diff --git a/test-install-heat.yml b/test-install-heat.yml
index 420cf679..298447c3 100644
--- a/test-install-heat.yml
+++ b/test-install-heat.yml
@@ -24,7 +24,7 @@
       vhost_name: "{{ heat_rabbitmq_vhost }}"
       user_name: "{{ heat_rabbitmq_userid }}"
       user_password: "{{ heat_rabbitmq_password }}"
-      when: "{{ groups['rabbitmq_all'] is defined }}"
+      when: groups['rabbitmq_all'] is defined
     - include: create-grant-db.yml
       db_name: "{{ heat_galera_database }}"
       db_password: "{{ heat_container_mysql_password }}"
diff --git a/test-install-keystone.yml b/test-install-keystone.yml
index 3772c478..715459cd 100644
--- a/test-install-keystone.yml
+++ b/test-install-keystone.yml
@@ -27,7 +27,7 @@
       vhost_name: "{{ keystone_rabbitmq_vhost }}"
       user_name: "{{ keystone_rabbitmq_userid }}"
       user_password: "{{ keystone_rabbitmq_password }}"
-      when: "{{ groups['rabbitmq_all'] is defined }}"
+      when: groups['rabbitmq_all'] is defined
     - include: create-grant-db.yml
       db_name: "{{ keystone_galera_database }}"
       db_password: "{{ keystone_container_mysql_password }}"