diff --git a/defaults/main.yml b/defaults/main.yml
index 030d95d4..3188d945 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -67,18 +67,22 @@ octavia_db_pool_timeout: 30
 ## Oslo Messaging
 
 # RPC
-octavia_oslomsg_rpc_transport: rabbit
-octavia_oslomsg_rpc_servers: 127.0.0.1
-octavia_oslomsg_rpc_port: 5672
-octavia_oslomsg_rpc_use_ssl: False
+octavia_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group | default('rabbitmq_all') }}"
+octavia_oslomsg_rpc_setup_host: "{{ (octavia_oslomsg_rpc_host_group in groups) | ternary(groups[octavia_oslomsg_rpc_host_group][0], 'localhost') }}"
+octavia_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport | default('rabbit') }}"
+octavia_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers | default('127.0.0.1') }}"
+octavia_oslomsg_rpc_port: "{{ oslomsg_rpc_port | default('5672') }}"
+octavia_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl | default(False) }}"
 octavia_oslomsg_rpc_userid: octavia
 octavia_oslomsg_rpc_vhost: /octavia
 
 # Notify
-octavia_oslomsg_notify_transport: rabbit
-octavia_oslomsg_notify_servers: 127.0.0.1
-octavia_oslomsg_notify_port: 5672
-octavia_oslomsg_notify_use_ssl: False
+octavia_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group | default('rabbitmq_all') }}"
+octavia_oslomsg_notify_setup_host: "{{ (octavia_oslomsg_notify_host_group in groups) | ternary(groups[octavia_oslomsg_notify_host_group][0], 'localhost') }}"
+octavia_oslomsg_notify_transport: "{{ oslomsg_notify_transport | default('rabbit') }}"
+octavia_oslomsg_notify_servers: "{{ oslomsg_notify_servers | default('127.0.0.1') }}"
+octavia_oslomsg_notify_port: "{{ oslomsg_notify_port | default('5672') }}"
+octavia_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl | default(False) }}"
 octavia_oslomsg_notify_userid: "{{ octavia_oslomsg_rpc_userid }}"
 octavia_oslomsg_notify_password: "{{ octavia_oslomsg_rpc_password }}"
 octavia_oslomsg_notify_vhost: "{{ octavia_oslomsg_rpc_vhost }}"
diff --git a/tasks/main.yml b/tasks/main.yml
index e43b5f29..4d08fb8b 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -83,8 +83,27 @@
     - octavia-install
     - octavia-config
 
+- include_tasks: mq_setup.yml
+  when:
+    - inventory_hostname == groups['octavia_all'][0]
+  with_items:
+    - oslomsg_setup_host: "{{ octavia_oslomsg_rpc_setup_host }}"
+      oslomsg_userid: "{{ octavia_oslomsg_rpc_userid }}"
+      oslomsg_password: "{{ octavia_oslomsg_rpc_password }}"
+      oslomsg_vhost: "{{ octavia_oslomsg_rpc_vhost }}"
+      oslomsg_transport: "{{ octavia_oslomsg_rpc_transport }}"
+    - oslomsg_setup_host: "{{ octavia_oslomsg_notify_setup_host }}"
+      oslomsg_userid: "{{ octavia_oslomsg_notify_userid }}"
+      oslomsg_password: "{{ octavia_oslomsg_notify_password }}"
+      oslomsg_vhost: "{{ octavia_oslomsg_notify_vhost }}"
+      oslomsg_transport: "{{ octavia_oslomsg_notify_transport }}"
+  no_log: true
+  tags:
+    - octavia-config
+
 - include: octavia_db_setup.yml
-  when: inventory_hostname == groups['octavia_all'][0]
+  when:
+    - inventory_hostname == groups['octavia_all'][0]
   tags:
     - octavia-install
 
diff --git a/tasks/mq_setup.yml b/tasks/mq_setup.yml
new file mode 100644
index 00000000..2ef034a3
--- /dev/null
+++ b/tasks/mq_setup.yml
@@ -0,0 +1,45 @@
+---
+# Copyright 2018, Rackspace US, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# WARNING:
+# This file is maintained in the openstack-ansible-tests repository.
+# https://git.openstack.org/cgit/openstack/openstack-ansible-tests/tree/sync/mq_setup.yml
+# If you need to modify this file, update the one in the openstack-ansible-tests
+# repository. Once it merges there, the changes will automatically be proposed to
+# all the repositories which use it.
+
+- name: Setup MQ Service (RabbitMQ)
+  delegate_to: "{{ item.oslomsg_setup_host }}"
+  when:
+    - "item.oslomsg_transport == 'rabbit'"
+  block:
+    - name: Add RabbitMQ vhost
+      rabbitmq_vhost:
+        name: "{{ item.oslomsg_vhost }}"
+        state: "present"
+
+    - name: Add RabbitMQ user
+      rabbitmq_user:
+        user: "{{ item.oslomsg_userid }}"
+        password: "{{ item.oslomsg_password }}"
+        vhost: "{{ item.oslomsg_vhost }}"
+        configure_priv: ".*"
+        read_priv: ".*"
+        write_priv: ".*"
+        state: "present"
+        force: true
+      no_log: true
+
+# Note: Add the tasks for additional MQ servers here
diff --git a/tests/os_octavia-overrides.yml b/tests/os_octavia-overrides.yml
index a6b64e10..a93e6626 100644
--- a/tests/os_octavia-overrides.yml
+++ b/tests/os_octavia-overrides.yml
@@ -50,20 +50,7 @@ octavia_galera_address: "{{ test_galera_host }}"
 octavia_galera_database: octavia
 octavia_galera_user: octavia
 octavia_container_mysql_password: "secrete"
-octavia_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}"
 octavia_oslomsg_rpc_password: "{{ oslomsg_rpc_password }}"
-octavia_oslomsg_rpc_userid: octavia
-octavia_oslomsg_rpc_vhost: /octavia
-octavia_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}"
-octavia_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}"
-octavia_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}"
-octavia_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}"
-octavia_oslomsg_notify_password: "{{ oslomsg_notify_password }}"
-octavia_oslomsg_notify_userid: octavia
-octavia_oslomsg_notify_vhost: /octavia
-octavia_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}"
-octavia_oslomsg_notify_ssl: "{{ oslomsg_notify_use_ssl }}"
-octavia_oslomsg_notify_port: "{{ oslomsg_notify_port }}"
 octavia_standalone: False
 octavia_swift_temp_url_secret_key: secrete
 octavia_keystone_auth_plugin: password
diff --git a/tests/test-install-octavia.yml b/tests/test-install-octavia.yml
index f9133fc8..206a5cb0 100644
--- a/tests/test-install-octavia.yml
+++ b/tests/test-install-octavia.yml
@@ -15,15 +15,7 @@
   hosts: octavia_all
   remote_user: root
   gather_facts: true
-  pre_tasks:
-    - include: common/ensure-oslomsg.yml
-      rpc_vhost: "{{ octavia_oslomsg_rpc_vhost }}"
-      rpc_user: "{{ octavia_oslomsg_rpc_userid }}"
-      rpc_password: "{{ octavia_oslomsg_rpc_password }}"
-      notify_vhost: "{{ octavia_oslomsg_notify_vhost }}"
-      notify_user: "{{ octavia_oslomsg_notify_userid }}"
-      notify_password: "{{ octavia_oslomsg_notify_password }}"
-  roles:
-    - role: "{{ octavia_rolename | default('os_octavia') }}"
   vars_files:
     - common/test-vars.yml
+  roles:
+    - role: "os_octavia"
diff --git a/vars/ubuntu-16.04.yml b/vars/ubuntu.yml
similarity index 100%
rename from vars/ubuntu-16.04.yml
rename to vars/ubuntu.yml