diff --git a/test-install-glance.yml b/test-install-glance.yml
index 40271538..ddf4b27c 100644
--- a/test-install-glance.yml
+++ b/test-install-glance.yml
@@ -60,6 +60,6 @@
       delegate_to: "{{ groups['galera_all'][0] }}"
       when: inventory_hostname == groups['glance_all'][0]
   roles:
-    - role: "openstack-ansible-os_glance"
+    - role: "{{ glance_rolename | default('os_glance') }}"
   vars_files:
     - test-vars.yml
diff --git a/test-install-keystone.yml b/test-install-keystone.yml
index 3a386ac8..b49515dc 100644
--- a/test-install-keystone.yml
+++ b/test-install-keystone.yml
@@ -55,7 +55,7 @@
       tags:
         - mysql-db-setup
   roles:
-    - role: "openstack-ansible-os_keystone"
+    - role: "{{ keystone_rolename | default('os_keystone') }}"
   vars_files:
     - test-vars.yml
 
diff --git a/test-install-swift.yml b/test-install-swift.yml
index 0fcb48e5..6459aab1 100644
--- a/test-install-swift.yml
+++ b/test-install-swift.yml
@@ -27,6 +27,6 @@
         - inventory_hostname in groups['swift_all']
         - hostvars[inventory_hostname]['container_networks']['replication_address']['address'] is defined
   roles:
-    - role: "openstack-ansible-os_swift"
+    - role: "{{ swift_rolename | default('os_swift') }}"
   vars_files:
     - test-vars.yml