diff --git a/test-install-heat.yml b/test-install-heat.yml
index ee96009e..a3f18c45 100644
--- a/test-install-heat.yml
+++ b/test-install-heat.yml
@@ -40,10 +40,7 @@
         - "'oslomsg_rpc_all' in groups"
         - "groups['oslomsg_rpc_all'] | length > 0"
 
-    - include: create-grant-db.yml
-      db_name: "{{ heat_galera_database }}"
-      db_password: "{{ heat_container_mysql_password }}"
   roles:
-    - role: "{{ heat_rolename | default('os_heat') }}"
+    - role: "os_heat"
   vars_files:
     - test-vars.yml
diff --git a/test-vars.yml b/test-vars.yml
index 16558e3f..6047d8ea 100644
--- a/test-vars.yml
+++ b/test-vars.yml
@@ -409,9 +409,6 @@ heat_service_password: secrete
 heat_stack_domain_admin_password: secrete
 heat_auth_encryption_key: 32characterslongboguskeyvaluefoo
 heat_container_mysql_password: "SuperSecrete"
-heat_galera_address: "{{ test_galera_host }}"
-heat_galera_user: heat
-heat_galera_database: heat
 heat_oslomsg_rpc_password: "{{ oslomsg_rpc_password }}"
 heat_oslomsg_rpc_userid: heat
 heat_oslomsg_rpc_vhost: /heat