diff --git a/defaults/main.yml b/defaults/main.yml
index e2a0866..a344e95 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -103,18 +103,22 @@ congress_program_name: congress-server
 ## Oslo Messaging info
 
 # RPC
-congress_oslomsg_rpc_transport: rabbit
-congress_oslomsg_rpc_servers: 127.0.0.1
-congress_oslomsg_rpc_port: 5672
-congress_oslomsg_rpc_use_ssl: False
+congress_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group | default('rabbitmq_all') }}"
+congress_oslomsg_rpc_setup_host: "{{ (congress_oslomsg_rpc_host_group in groups) | ternary(groups[congress_oslomsg_rpc_host_group][0], 'localhost') }}"
+congress_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport | default('rabbit') }}"
+congress_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers | default('127.0.0.1') }}"
+congress_oslomsg_rpc_port: "{{ oslomsg_rpc_port | default('5672') }}"
+congress_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl | default(False) }}"
 congress_oslomsg_rpc_userid: congress
 congress_oslomsg_rpc_vhost: /congress
 
 # Notify
-congress_oslomsg_notify_transport: rabbit
-congress_oslomsg_notify_servers: 127.0.0.1
-congress_oslomsg_notify_port: 5672
-congress_oslomsg_notify_use_ssl: False
+congress_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group | default('rabbitmq_all') }}"
+congress_oslomsg_notify_setup_host: "{{ (congress_oslomsg_notify_host_group in groups) | ternary(groups[congress_oslomsg_notify_host_group][0], 'localhost') }}"
+congress_oslomsg_notify_transport: "{{ oslomsg_notify_transport | default('rabbit') }}"
+congress_oslomsg_notify_servers: "{{ oslomsg_notify_servers | default('127.0.0.1') }}"
+congress_oslomsg_notify_port: "{{ oslomsg_notify_port | default('5672') }}"
+congress_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl | default(False) }}"
 congress_oslomsg_notify_userid: "{{ congress_oslomsg_rpc_userid }}"
 congress_oslomsg_notify_password: "{{ congress_oslomsg_rpc_password }}"
 congress_oslomsg_notify_vhost: "{{ congress_oslomsg_rpc_vhost }}"
diff --git a/tasks/main.yml b/tasks/main.yml
index e8e333d..fcf4c7f 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -42,14 +42,32 @@
   tags:
     - congress-config
 
+- include_tasks: mq_setup.yml
+  when:
+    - "inventory_hostname == ((groups['congress_all'] | intersect(ansible_play_hosts)) | list)[0]"
+  with_items:
+    - oslomsg_setup_host: "{{ congress_oslomsg_rpc_setup_host }}"
+      oslomsg_userid: "{{ congress_oslomsg_rpc_userid }}"
+      oslomsg_password: "{{ congress_oslomsg_rpc_password }}"
+      oslomsg_vhost: "{{ congress_oslomsg_rpc_vhost }}"
+      oslomsg_transport: "{{ congress_oslomsg_rpc_transport }}"
+    - oslomsg_setup_host: "{{ congress_oslomsg_notify_setup_host }}"
+      oslomsg_userid: "{{ congress_oslomsg_notify_userid }}"
+      oslomsg_password: "{{ congress_oslomsg_notify_password }}"
+      oslomsg_vhost: "{{ congress_oslomsg_notify_vhost }}"
+      oslomsg_transport: "{{ congress_oslomsg_notify_transport }}"
+  no_log: true
+  tags:
+    - congress-config
+
 - include: congress_db_setup.yml
   when:
-    - "inventory_hostname == ((groups['congress_all']| intersect(ansible_play_hosts)) | list)[0]"
+    - "inventory_hostname == ((groups['congress_all'] | intersect(ansible_play_hosts)) | list)[0]"
   tags:
     - congress-config
 
 - include: congress_service_setup.yml
   when:
-    - "inventory_hostname == ((groups['congress_all']| intersect(ansible_play_hosts)) | list)[0]"
+    - "inventory_hostname == ((groups['congress_all'] | intersect(ansible_play_hosts)) | list)[0]"
   tags:
     - congress-config
diff --git a/tasks/mq_setup.yml b/tasks/mq_setup.yml
new file mode 100644
index 0000000..2ef034a
--- /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_congress-overrides.yml b/tests/os_congress-overrides.yml
index ec57298..325528a 100644
--- a/tests/os_congress-overrides.yml
+++ b/tests/os_congress-overrides.yml
@@ -14,19 +14,10 @@
 # limitations under the License.
 
 # Use the tests repo values
-congress_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}"
-congress_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}"
-congress_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}"
-congress_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}"
-congress_oslomsg_notify_port: "{{ oslomsg_notify_port }}"
-congress_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}"
-congress_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}"
-congress_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}"
 congress_galera_address: "{{ test_galera_host }}"
 
 # Required settings with no defaults
 congress_oslomsg_rpc_password: "secrete"
-congress_oslomsg_notify_password: "{{ congress_oslomsg_rpc_password }}"
 congress_service_password: "secrete"
 congress_container_mysql_password: "secrete"
 
diff --git a/tests/test-install-congress.yml b/tests/test-install-congress.yml
index e71a293..d88b27e 100644
--- a/tests/test-install-congress.yml
+++ b/tests/test-install-congress.yml
@@ -18,16 +18,7 @@
   remote_user: root
   gather_facts: true
   any_errors_fatal: true
-  pre_tasks:
-    - include: common/ensure-oslomsg.yml
-      rpc_vhost: "{{ congress_oslomsg_rpc_vhost }}"
-      rpc_user: "{{ congress_oslomsg_rpc_userid }}"
-      rpc_password: "{{ congress_oslomsg_rpc_password }}"
-      notify_vhost: "{{ congress_oslomsg_notify_vhost }}"
-      notify_user: "{{ congress_oslomsg_notify_userid }}"
-      notify_password: "{{ congress_oslomsg_notify_password }}"
-
-  roles:
-    - role: "os_congress"
   vars_files:
     - common/test-vars.yml
+  roles:
+    - role: "os_congress"