diff --git a/heat/files/newton/heat.conf.Debian b/heat/files/newton/heat.conf.Debian
index be6e869..1c41dc9 100644
--- a/heat/files/newton/heat.conf.Debian
+++ b/heat/files/newton/heat.conf.Debian
@@ -207,7 +207,7 @@
                          {%- endfor -%}
                              /{{ server.message_queue.virtual_host }}
 {%- else %}
-transport_url = rabbit://{{ server.message_queue.user }}:{{ server.message_queue.password }}@{{ server.message_queue.host }}:{{ server.message_queue.port }}{{ server.message_queue.virtual_host }}
+transport_url = rabbit://{{ server.message_queue.user }}:{{ server.message_queue.password }}@{{ server.message_queue.host }}:{{ server.message_queue.port }}/{{ server.message_queue.virtual_host }}
 {%- endif %}
 # The default exchange under which topics are scoped. May be overridden by an
 # exchange name specified in the transport_url option. (string value)
diff --git a/heat/files/ocata/heat.conf.Debian b/heat/files/ocata/heat.conf.Debian
index 7504d28..3aecf39 100644
--- a/heat/files/ocata/heat.conf.Debian
+++ b/heat/files/ocata/heat.conf.Debian
@@ -584,7 +584,7 @@
                          {%- endfor -%}
                              /{{ server.message_queue.virtual_host }}
 {%- else %}
-transport_url = rabbit://{{ server.message_queue.user }}:{{ server.message_queue.password }}@{{ server.message_queue.host }}:{{ server.message_queue.port }}{{ server.message_queue.virtual_host }}
+transport_url = rabbit://{{ server.message_queue.user }}:{{ server.message_queue.password }}@{{ server.message_queue.host }}:{{ server.message_queue.port }}/{{ server.message_queue.virtual_host }}
 {%- endif %}
 # DEPRECATED: The messaging driver to use, defaults to rabbit. Other drivers
 # include amqp and zmq. (string value)
diff --git a/heat/files/ocata/heat.conf.RedHat b/heat/files/ocata/heat.conf.RedHat
index 77819af..08e351a 120000
--- a/heat/files/ocata/heat.conf.RedHat
+++ b/heat/files/ocata/heat.conf.RedHat
@@ -1 +1 @@
-heat.conf.RedHat
\ No newline at end of file
+heat.conf.Debian
\ No newline at end of file
diff --git a/tests/pillar/server_cluster.sls b/tests/pillar/server_cluster.sls
index 0a8e0f5..7e40d87 100644
--- a/tests/pillar/server_cluster.sls
+++ b/tests/pillar/server_cluster.sls
@@ -24,12 +24,15 @@
     metadata:
       host: 127.0.0.1
       port: 8000
+      protocol: http
     waitcondition:
       host: 127.0.0.1
       port: 8000
+      protocol: http
     watch:
       host: 127.0.0.1
       port: 8003
+      protocol: http
     identity:
       engine: keystone
       host: 127.0.0.1
diff --git a/tests/pillar/server_plugin_dirs.sls b/tests/pillar/server_plugin_dirs.sls
index 846bab0..a8db864 100644
--- a/tests/pillar/server_plugin_dirs.sls
+++ b/tests/pillar/server_plugin_dirs.sls
@@ -24,12 +24,15 @@
     metadata:
       host: 127.0.0.1
       port: 8000
+      protocol: http
     waitcondition:
       host: 127.0.0.1
       port: 8000
+      protocol: http
     watch:
       host: 127.0.0.1
       port: 8003
+      protocol: http
     identity:
       engine: keystone
       host: 127.0.0.1
diff --git a/tests/pillar/server_single.sls b/tests/pillar/server_single.sls
index 1600f46..2e38c5a 100644
--- a/tests/pillar/server_single.sls
+++ b/tests/pillar/server_single.sls
@@ -24,12 +24,15 @@
     metadata:
       host: 127.0.0.1
       port: 8000
+      protocol: http
     waitcondition:
       host: 127.0.0.1
       port: 8000
+      protocol: http
     watch:
       host: 127.0.0.1
       port: 8003
+      protocol: http
     identity:
       engine: keystone
       host: 127.0.0.1