diff --git a/tests/test-install-keystone.yml b/tests/test-install-keystone.yml
index 5bbe34f3..ef35b81b 100644
--- a/tests/test-install-keystone.yml
+++ b/tests/test-install-keystone.yml
@@ -24,9 +24,6 @@
         state: "present"
       delegate_to: "10.100.102.101"
       when: inventory_hostname == groups['keystone_all'][0]
-      tags:
-        - aodh-rabbitmq
-        - aodh-rabbitmq-vhost
     - name: Ensure rabbitmq user
       rabbitmq_user:
         user: "{{ keystone_rabbitmq_userid }}"
@@ -38,9 +35,6 @@
         state: "present"
       delegate_to: "10.100.102.101"
       when: inventory_hostname == groups['keystone_all'][0]
-      tags:
-        - aodh-rabbitmq
-        - aodh-rabbitmq-user
     - name: Create DB for service
       mysql_db:
         login_user: "root"
@@ -50,8 +44,6 @@
         state: "present"
       delegate_to: "10.100.102.101"
       when: inventory_hostname == groups['keystone_all'][0]
-      tags:
-        - mysql-db-setup
     - name: Grant access to the DB for the service
       mysql_user:
         login_user: "root"
@@ -67,8 +59,6 @@
         - "%"
       delegate_to: "10.100.102.101"
       when: inventory_hostname == groups['keystone_all'][0]
-      tags:
-        - mysql-db-setup
   roles:
     - role: os_keystone
   vars_files:
diff --git a/tests/test-install-neutron.yml b/tests/test-install-neutron.yml
index 18cba9f2..27b8330a 100644
--- a/tests/test-install-neutron.yml
+++ b/tests/test-install-neutron.yml
@@ -62,9 +62,6 @@
         state: "present"
       delegate_to: "10.100.102.101"
       when: inventory_hostname == groups['neutron_all'][0]
-      tags:
-        - neutron-rabbitmq
-        - neutron-rabbitmq-vhost
     - name: Ensure rabbitmq user
       rabbitmq_user:
         user: "{{ neutron_rabbitmq_userid }}"
@@ -76,9 +73,6 @@
         state: "present"
       delegate_to: "10.100.102.101"
       when: inventory_hostname == groups['neutron_all'][0]
-      tags:
-        - neutron-rabbitmq
-        - neutron-rabbitmq-user
     - name: Create DB for service
       mysql_db:
         login_user: "root"
@@ -88,8 +82,6 @@
         state: "present"
       delegate_to: "10.100.102.101"
       when: inventory_hostname == groups['neutron_all'][0]
-      tags:
-        - mysql-db-setup
     - name: Grant access to the DB for the service
       mysql_user:
         login_user: "root"
@@ -105,8 +97,6 @@
         - "%"
       delegate_to: "10.100.102.101"
       when: inventory_hostname == groups['neutron_all'][0]
-      tags:
-        - mysql-db-setup
   roles:
     - role: "os_neutron"
   vars_files:
diff --git a/tests/test-install-nova.yml b/tests/test-install-nova.yml
index d88a5710..18ef38b0 100644
--- a/tests/test-install-nova.yml
+++ b/tests/test-install-nova.yml
@@ -36,9 +36,6 @@
         state: "present"
       delegate_to: "10.100.102.101"
       when: inventory_hostname == groups['nova_all'][0]
-      tags:
-        - nova-rabbitmq
-        - nova-rabbitmq-vhost
     - name: Ensure rabbitmq user
       rabbitmq_user:
         user: "{{ nova_rabbitmq_userid }}"
@@ -50,9 +47,6 @@
         state: "present"
       delegate_to: "10.100.102.101"
       when: inventory_hostname == groups['nova_all'][0]
-      tags:
-        - nova-rabbitmq
-        - nova-rabbitmq-user
     - name: Create DB for service
       mysql_db:
         login_user: "{{ galera_root_user }}"
@@ -62,8 +56,6 @@
         state: "present"
       delegate_to: "10.100.102.101"
       when: inventory_hostname == groups['nova_all'][0]
-      tags:
-        - mysql-db-setup
     - name: Grant access to the DB for the service
       mysql_user:
         login_user: "{{ galera_root_user }}"
@@ -79,8 +71,6 @@
         - "%"
       delegate_to: "10.100.102.101"
       when: inventory_hostname == groups['nova_all'][0]
-      tags:
-        - mysql-db-setup
     - name: Create API DB for service
       mysql_db:
         login_user: "{{ galera_root_user }}"
@@ -89,8 +79,6 @@
         name: "{{ nova_api_galera_database }}"
         state: "present"
       when: inventory_hostname == groups['nova_all'][0]
-      tags:
-        - nova-db-setup
     - name: Grant access to the API DB for the service
       mysql_user:
         login_user: "{{ galera_root_user }}"
@@ -105,8 +93,6 @@
         - "localhost"
         - "%"
       when: inventory_hostname == groups['nova_all'][0]
-      tags:
-        - nova-db-setup
   roles:
     - role: "{{ rolename | basename }}"
   vars_files: