diff --git a/heat/files/kilo/heat.conf.Debian b/heat/files/kilo/heat.conf.Debian
index e0aaf9a..75209d2 100644
--- a/heat/files/kilo/heat.conf.Debian
+++ b/heat/files/kilo/heat.conf.Debian
@@ -822,11 +822,6 @@
 # (infinite retry count). (integer value)
 #rabbit_max_retries=0
 
-# Use HA queues in RabbitMQ (x-ha-policy: all). If you change
-# this option, you must wipe the RabbitMQ database. (boolean
-# value)
-rabbit_ha_queues={{ server.message_queue.ha_queues }}
-
 #rabbit_host = localhost
 
 # The RabbitMQ broker port where a single node is used. (integer value)
diff --git a/heat/files/liberty/heat.conf.Debian b/heat/files/liberty/heat.conf.Debian
index 7cb72be..22d07ab 100644
--- a/heat/files/liberty/heat.conf.Debian
+++ b/heat/files/liberty/heat.conf.Debian
@@ -822,11 +822,6 @@
 # (infinite retry count). (integer value)
 #rabbit_max_retries=0
 
-# Use HA queues in RabbitMQ (x-ha-policy: all). If you change
-# this option, you must wipe the RabbitMQ database. (boolean
-# value)
-rabbit_ha_queues={{ server.message_queue.ha_queues }}
-
 #rabbit_host = localhost
 
 # The RabbitMQ broker port where a single node is used. (integer value)
diff --git a/tests/pillar/server_single.sls b/tests/pillar/server_single.sls
index 667fc69..ff7ed5b 100644
--- a/tests/pillar/server_single.sls
+++ b/tests/pillar/server_single.sls
@@ -44,4 +44,3 @@
       user: openstack
       password: password
       virtual_host: '/openstack'
-      ha_queues: true
\ No newline at end of file