diff --git a/tasks/swift_service_setup.yml b/tasks/swift_service_setup.yml
index 9ab581cf..b2d6b846 100644
--- a/tasks/swift_service_setup.yml
+++ b/tasks/swift_service_setup.yml
@@ -104,13 +104,12 @@
     login_user: "{{ keystone_admin_user_name }}"
     login_password: "{{ keystone_auth_admin_password }}"
     login_project_name: "{{ keystone_admin_tenant_name }}"
-    role_name: "ResellerAdmin"
+    role_name: "{{ swift_reselleradmin_role }}"
     insecure: "{{ keystone_service_adminuri_insecure }}"
   register: add_role
   until: add_role|success
   retries: 5
   delay: 10
-  when: swift_ceilometer_enabled | bool
 
 - name: "Add ResellerAdmin role to the service tenant and ceilometer user"
   keystone:
diff --git a/tests/test-swift-functional.yml b/tests/test-swift-functional.yml
index 65a11af0..fc7e54bf 100644
--- a/tests/test-swift-functional.yml
+++ b/tests/test-swift-functional.yml
@@ -35,7 +35,6 @@
       role_name: "{{ item }}"
       insecure: "{{ keystone_service_adminuri_insecure }}"
     with_items:
-      - "ResellerAdmin"
       - "test-role"
       - "test5"
     run_once: true