diff --git a/spec/classes/rabbitmq_spec.rb b/spec/classes/rabbitmq_spec.rb
index 916c82be1..32e4e4ade 100644
--- a/spec/classes/rabbitmq_spec.rb
+++ b/spec/classes/rabbitmq_spec.rb
@@ -408,7 +408,7 @@
           end
 
           it 'for cluster_nodes' do
-            is_expected.to contain_file('rabbitmq.config').with('content' => %r{cluster_nodes.*\['rabbit@hare-1', 'rabbit@hare-2'\], ram})
+            is_expected.to contain_file('rabbitmq.config').with('content' => %r{^ {4}\{cluster_nodes, \{\['rabbit@hare-1', 'rabbit@hare-2'\], ram})
           end
         end
 
@@ -423,7 +423,7 @@
           end
 
           it 'for cluster_nodes' do
-            is_expected.to contain_file('rabbitmq.config').with('content' => %r{cluster_nodes.*\[\], ram})
+            is_expected.to contain_file('rabbitmq.config').with('content' => %r{^ {4}\{cluster_nodes, \{\[\], ram})
           end
         end
       end
diff --git a/templates/rabbitmq.config.epp b/templates/rabbitmq.config.epp
index c108354c1..3e9c40f70 100644
--- a/templates/rabbitmq.config.epp
+++ b/templates/rabbitmq.config.epp
@@ -19,11 +19,11 @@
     {auth_backends, [rabbit_auth_backend_internal, rabbit_auth_backend_ldap]},
 <% } -%>
 <% if $rabbitmq::config::config_cluster {-%>
-    <% if !$rabbitmq::config::cluster_nodes.empty {-%>
+    <%- if !$rabbitmq::config::cluster_nodes.empty {-%>
     {cluster_nodes, {['rabbit@<%= $rabbitmq::config::cluster_nodes.join("', 'rabbit@") %>'], <%= $rabbitmq::config::cluster_node_type %>}},
-    <% } else {%>
+    <%- } else {-%>
     {cluster_nodes, {[], <%= $rabbitmq::config::cluster_node_type %>}},
-    <% } %>
+    <%- } -%>
     {cluster_partition_handling, <%= $rabbitmq::config::cluster_partition_handling %>},
 <% } -%>
     {tcp_listen_options, [