diff --git a/test-install-gnocchi.yml b/test-install-gnocchi.yml
index a1ba66f7..657b06ff 100644
--- a/test-install-gnocchi.yml
+++ b/test-install-gnocchi.yml
@@ -19,11 +19,7 @@
   become: true
   gather_facts: true
   any_errors_fatal: true
-  pre_tasks:
-    - include: create-grant-db.yml
-      db_name: "{{ gnocchi_database_name }}"
-      db_password: "{{ gnocchi_container_mysql_password }}"
   roles:
-    - role: "{{ gnocchi_rolename | default('os_gnocchi') }}"
+    - role: "os_gnocchi"
   vars_files:
     - test-vars.yml
diff --git a/test-vars.yml b/test-vars.yml
index 16558e3f..e1ff2546 100644
--- a/test-vars.yml
+++ b/test-vars.yml
@@ -439,11 +439,9 @@ gnocchi_developer_mode: true
 gnocchi_service_publicuri: "http://{{ test_gnocchi_api_host }}:8041"
 gnocchi_service_adminuri: "http://{{ test_gnocchi_api_host }}:8041"
 gnocchi_service_internaluri: "http://{{ test_gnocchi_api_host }}:8041"
-gnocchi_database_name: "gnocchi"
 gnocchi_container_mysql_password: "secrete"
 gnocchi_keystone_auth: yes
 gnocchi_service_password: "secrete"
-gnocchi_galera_address: "{{ test_galera_host }}"
 gnocchi_ssl_external: false
 
 # Ironic specific settings