diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
index e51fff2e2a..6f01a437fa 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
@@ -127,8 +127,6 @@ ${cluster-security.settings}${cluster.settings}${replicated.settings}${shared-st
             <address-full-policy>${full-policy}</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -141,8 +139,6 @@ ${cluster-security.settings}${cluster.settings}${replicated.settings}${shared-st
             <address-full-policy>${full-policy}</address-full-policy>
             <auto-create-queues>${auto-create}</auto-create-queues>
             <auto-create-addresses>${auto-create}</auto-create-addresses>
-            <auto-create-jms-queues>${auto-create}</auto-create-jms-queues>
-            <auto-create-jms-topics>${auto-create}</auto-create-jms-topics>
             <auto-delete-queues>${auto-delete}</auto-delete-queues>
             <auto-delete-addresses>${auto-delete}</auto-delete-addresses>
          </address-setting>
diff --git a/artemis-features/src/main/resources/artemis.xml b/artemis-features/src/main/resources/artemis.xml
index 3d685a5555..8a5ea2fb55 100644
--- a/artemis-features/src/main/resources/artemis.xml
+++ b/artemis-features/src/main/resources/artemis.xml
@@ -161,8 +161,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -175,8 +173,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/artemis-server/src/test/resources/ConfigurationTest-full-config-wrong-address.xml b/artemis-server/src/test/resources/ConfigurationTest-full-config-wrong-address.xml
index 10459f22a6..54e1f3ba65 100644
--- a/artemis-server/src/test/resources/ConfigurationTest-full-config-wrong-address.xml
+++ b/artemis-server/src/test/resources/ConfigurationTest-full-config-wrong-address.xml
@@ -175,8 +175,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -189,8 +187,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/examples/features/broker-balancer/evenly-redirect/src/main/resources/activemq/server0/broker.xml b/examples/features/broker-balancer/evenly-redirect/src/main/resources/activemq/server0/broker.xml
index a303f42979..49249827d0 100644
--- a/examples/features/broker-balancer/evenly-redirect/src/main/resources/activemq/server0/broker.xml
+++ b/examples/features/broker-balancer/evenly-redirect/src/main/resources/activemq/server0/broker.xml
@@ -98,8 +98,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -112,8 +110,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/examples/features/broker-balancer/evenly-redirect/src/main/resources/activemq/server1/broker.xml b/examples/features/broker-balancer/evenly-redirect/src/main/resources/activemq/server1/broker.xml
index a9800a8fe5..670c3cdd13 100644
--- a/examples/features/broker-balancer/evenly-redirect/src/main/resources/activemq/server1/broker.xml
+++ b/examples/features/broker-balancer/evenly-redirect/src/main/resources/activemq/server1/broker.xml
@@ -76,8 +76,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -90,8 +88,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/examples/features/broker-balancer/evenly-redirect/src/main/resources/activemq/server2/broker.xml b/examples/features/broker-balancer/evenly-redirect/src/main/resources/activemq/server2/broker.xml
index ed92197af3..e3979b63c7 100644
--- a/examples/features/broker-balancer/evenly-redirect/src/main/resources/activemq/server2/broker.xml
+++ b/examples/features/broker-balancer/evenly-redirect/src/main/resources/activemq/server2/broker.xml
@@ -76,8 +76,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -90,8 +88,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/examples/features/broker-balancer/symmetric-redirect/src/main/resources/activemq/server0/broker.xml b/examples/features/broker-balancer/symmetric-redirect/src/main/resources/activemq/server0/broker.xml
index 9316bfbe1b..ee44289c32 100644
--- a/examples/features/broker-balancer/symmetric-redirect/src/main/resources/activemq/server0/broker.xml
+++ b/examples/features/broker-balancer/symmetric-redirect/src/main/resources/activemq/server0/broker.xml
@@ -113,8 +113,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -127,8 +125,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/examples/features/broker-balancer/symmetric-redirect/src/main/resources/activemq/server1/broker.xml b/examples/features/broker-balancer/symmetric-redirect/src/main/resources/activemq/server1/broker.xml
index b3fa125b8c..ac82fbfb97 100644
--- a/examples/features/broker-balancer/symmetric-redirect/src/main/resources/activemq/server1/broker.xml
+++ b/examples/features/broker-balancer/symmetric-redirect/src/main/resources/activemq/server1/broker.xml
@@ -113,8 +113,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -127,8 +125,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/examples/features/broker-balancer/symmetric-simple/src/main/resources/activemq/server0/broker.xml b/examples/features/broker-balancer/symmetric-simple/src/main/resources/activemq/server0/broker.xml
index 7ca578c67d..206c1312de 100644
--- a/examples/features/broker-balancer/symmetric-simple/src/main/resources/activemq/server0/broker.xml
+++ b/examples/features/broker-balancer/symmetric-simple/src/main/resources/activemq/server0/broker.xml
@@ -84,8 +84,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -98,8 +96,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/examples/features/broker-balancer/symmetric-simple/src/main/resources/activemq/server1/broker.xml b/examples/features/broker-balancer/symmetric-simple/src/main/resources/activemq/server1/broker.xml
index 2e759c6381..739f398771 100644
--- a/examples/features/broker-balancer/symmetric-simple/src/main/resources/activemq/server1/broker.xml
+++ b/examples/features/broker-balancer/symmetric-simple/src/main/resources/activemq/server1/broker.xml
@@ -85,8 +85,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -99,8 +97,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/examples/features/broker-connection/amqp-receiving-messages/src/main/resources/activemq/server0/broker.xml b/examples/features/broker-connection/amqp-receiving-messages/src/main/resources/activemq/server0/broker.xml
index caf55b0000..e6e79bb5e0 100644
--- a/examples/features/broker-connection/amqp-receiving-messages/src/main/resources/activemq/server0/broker.xml
+++ b/examples/features/broker-connection/amqp-receiving-messages/src/main/resources/activemq/server0/broker.xml
@@ -85,8 +85,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -99,8 +97,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/examples/features/broker-connection/amqp-receiving-messages/src/main/resources/activemq/server1/broker.xml b/examples/features/broker-connection/amqp-receiving-messages/src/main/resources/activemq/server1/broker.xml
index 74dfaa6b4f..dea52c9d6c 100644
--- a/examples/features/broker-connection/amqp-receiving-messages/src/main/resources/activemq/server1/broker.xml
+++ b/examples/features/broker-connection/amqp-receiving-messages/src/main/resources/activemq/server1/broker.xml
@@ -79,8 +79,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -93,8 +91,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/examples/features/broker-connection/amqp-sending-messages-multicast/src/main/resources/activemq/server0/broker.xml b/examples/features/broker-connection/amqp-sending-messages-multicast/src/main/resources/activemq/server0/broker.xml
index 57ee932eda..9bd1567acf 100644
--- a/examples/features/broker-connection/amqp-sending-messages-multicast/src/main/resources/activemq/server0/broker.xml
+++ b/examples/features/broker-connection/amqp-sending-messages-multicast/src/main/resources/activemq/server0/broker.xml
@@ -85,8 +85,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -99,8 +97,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/examples/features/broker-connection/amqp-sending-messages-multicast/src/main/resources/activemq/server1/broker.xml b/examples/features/broker-connection/amqp-sending-messages-multicast/src/main/resources/activemq/server1/broker.xml
index 8b25279516..ce29299d74 100644
--- a/examples/features/broker-connection/amqp-sending-messages-multicast/src/main/resources/activemq/server1/broker.xml
+++ b/examples/features/broker-connection/amqp-sending-messages-multicast/src/main/resources/activemq/server1/broker.xml
@@ -79,8 +79,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -93,8 +91,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/examples/features/broker-connection/amqp-sending-messages/src/main/resources/activemq/server0/broker.xml b/examples/features/broker-connection/amqp-sending-messages/src/main/resources/activemq/server0/broker.xml
index fcf35f4f0b..05a1a2500e 100644
--- a/examples/features/broker-connection/amqp-sending-messages/src/main/resources/activemq/server0/broker.xml
+++ b/examples/features/broker-connection/amqp-sending-messages/src/main/resources/activemq/server0/broker.xml
@@ -85,8 +85,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -99,8 +97,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/examples/features/broker-connection/amqp-sending-messages/src/main/resources/activemq/server1/broker.xml b/examples/features/broker-connection/amqp-sending-messages/src/main/resources/activemq/server1/broker.xml
index 67a19673bd..cbc25f46ed 100644
--- a/examples/features/broker-connection/amqp-sending-messages/src/main/resources/activemq/server1/broker.xml
+++ b/examples/features/broker-connection/amqp-sending-messages/src/main/resources/activemq/server1/broker.xml
@@ -79,8 +79,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -93,8 +91,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/examples/features/standard/broker-msg-auth-plugin/src/main/resources/activemq/server0/broker.xml b/examples/features/standard/broker-msg-auth-plugin/src/main/resources/activemq/server0/broker.xml
index f756fbedd2..e46b195ee4 100644
--- a/examples/features/standard/broker-msg-auth-plugin/src/main/resources/activemq/server0/broker.xml
+++ b/examples/features/standard/broker-msg-auth-plugin/src/main/resources/activemq/server0/broker.xml
@@ -165,8 +165,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -179,8 +177,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/examples/features/standard/broker-plugin/src/main/resources/activemq/server0/broker.xml b/examples/features/standard/broker-plugin/src/main/resources/activemq/server0/broker.xml
index 50d5e8dc41..594e62f43e 100644
--- a/examples/features/standard/broker-plugin/src/main/resources/activemq/server0/broker.xml
+++ b/examples/features/standard/broker-plugin/src/main/resources/activemq/server0/broker.xml
@@ -162,8 +162,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -176,8 +174,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/tests/smoke-tests/src/main/resources/servers/MaxQueueResourceTest/broker.xml b/tests/smoke-tests/src/main/resources/servers/MaxQueueResourceTest/broker.xml
index 10dfa941e5..5dbe0259d7 100644
--- a/tests/smoke-tests/src/main/resources/servers/MaxQueueResourceTest/broker.xml
+++ b/tests/smoke-tests/src/main/resources/servers/MaxQueueResourceTest/broker.xml
@@ -56,7 +56,7 @@ under the License.
       <journal-device-block-size>4096</journal-device-block-size>
 
       <journal-file-size>10M</journal-file-size>
-      
+
       <!--
        This value was determined through a calculation.
        Your system could perform 25 writes per millisecond
@@ -118,7 +118,7 @@ under the License.
 
       <critical-analyzer-policy>HALT</critical-analyzer-policy>
 
-      
+
       <page-sync-timeout>40000</page-sync-timeout>
 
 
@@ -180,8 +180,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -194,8 +192,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/tests/smoke-tests/src/main/resources/servers/audit-logging/broker.xml b/tests/smoke-tests/src/main/resources/servers/audit-logging/broker.xml
index 73224c67bc..e50e7ec981 100644
--- a/tests/smoke-tests/src/main/resources/servers/audit-logging/broker.xml
+++ b/tests/smoke-tests/src/main/resources/servers/audit-logging/broker.xml
@@ -148,8 +148,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -162,8 +160,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/tests/smoke-tests/src/main/resources/servers/audit-logging2/broker.xml b/tests/smoke-tests/src/main/resources/servers/audit-logging2/broker.xml
index 4d49b1176e..b9fa83cd6c 100644
--- a/tests/smoke-tests/src/main/resources/servers/audit-logging2/broker.xml
+++ b/tests/smoke-tests/src/main/resources/servers/audit-logging2/broker.xml
@@ -148,8 +148,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -162,8 +160,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/tests/smoke-tests/src/main/resources/servers/bridgeTransfer/serverA/broker.xml b/tests/smoke-tests/src/main/resources/servers/bridgeTransfer/serverA/broker.xml
index b43b5b57a8..54350526e1 100644
--- a/tests/smoke-tests/src/main/resources/servers/bridgeTransfer/serverA/broker.xml
+++ b/tests/smoke-tests/src/main/resources/servers/bridgeTransfer/serverA/broker.xml
@@ -110,7 +110,7 @@ under the License.
 
       <critical-analyzer-policy>HALT</critical-analyzer-policy>
 
-      
+
 
             <!-- the system will enter into page mode once you hit this limit.
            This is an estimate in bytes of how much the messages are using in memory
@@ -189,8 +189,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -203,8 +201,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/tests/smoke-tests/src/main/resources/servers/bridgeTransfer/serverB/broker.xml b/tests/smoke-tests/src/main/resources/servers/bridgeTransfer/serverB/broker.xml
index 8920f419f7..db9e37e03f 100644
--- a/tests/smoke-tests/src/main/resources/servers/bridgeTransfer/serverB/broker.xml
+++ b/tests/smoke-tests/src/main/resources/servers/bridgeTransfer/serverB/broker.xml
@@ -110,7 +110,7 @@ under the License.
 
       <critical-analyzer-policy>HALT</critical-analyzer-policy>
 
-      
+
 
             <!-- the system will enter into page mode once you hit this limit.
            This is an estimate in bytes of how much the messages are using in memory
@@ -171,8 +171,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -185,8 +183,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/tests/smoke-tests/src/main/resources/servers/brokerConnect/bridgeSecurityA/broker.xml b/tests/smoke-tests/src/main/resources/servers/brokerConnect/bridgeSecurityA/broker.xml
index 72e6541076..c13b6e27b0 100644
--- a/tests/smoke-tests/src/main/resources/servers/brokerConnect/bridgeSecurityA/broker.xml
+++ b/tests/smoke-tests/src/main/resources/servers/brokerConnect/bridgeSecurityA/broker.xml
@@ -55,7 +55,7 @@ under the License.
       <journal-device-block-size>4096</journal-device-block-size>
 
       <journal-file-size>10M</journal-file-size>
-      
+
       <!--
        This value was determined through a calculation.
        Your system could perform 25 writes per millisecond
@@ -117,7 +117,7 @@ under the License.
 
       <critical-analyzer-policy>HALT</critical-analyzer-policy>
 
-      
+
       <page-sync-timeout>40000</page-sync-timeout>
 
 
@@ -189,8 +189,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -203,8 +201,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/tests/smoke-tests/src/main/resources/servers/brokerConnect/bridgeSecurityB/broker.xml b/tests/smoke-tests/src/main/resources/servers/brokerConnect/bridgeSecurityB/broker.xml
index 694d947815..9423554588 100644
--- a/tests/smoke-tests/src/main/resources/servers/brokerConnect/bridgeSecurityB/broker.xml
+++ b/tests/smoke-tests/src/main/resources/servers/brokerConnect/bridgeSecurityB/broker.xml
@@ -55,7 +55,7 @@ under the License.
       <journal-device-block-size>4096</journal-device-block-size>
 
       <journal-file-size>10M</journal-file-size>
-      
+
       <!--
        This value was determined through a calculation.
        Your system could perform 25 writes per millisecond
@@ -117,7 +117,7 @@ under the License.
 
       <critical-analyzer-policy>HALT</critical-analyzer-policy>
 
-      
+
       <page-sync-timeout>40000</page-sync-timeout>
 
 
@@ -181,8 +181,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -195,8 +193,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/tests/smoke-tests/src/main/resources/servers/brokerConnect/chainedMirror/serverA/broker.xml b/tests/smoke-tests/src/main/resources/servers/brokerConnect/chainedMirror/serverA/broker.xml
index 371491e25e..0bf50c1cbb 100644
--- a/tests/smoke-tests/src/main/resources/servers/brokerConnect/chainedMirror/serverA/broker.xml
+++ b/tests/smoke-tests/src/main/resources/servers/brokerConnect/chainedMirror/serverA/broker.xml
@@ -56,7 +56,7 @@ under the License.
       <journal-device-block-size>4096</journal-device-block-size>
 
       <journal-file-size>10M</journal-file-size>
-      
+
       <!--
        This value was determined through a calculation.
        Your system could perform 25 writes per millisecond
@@ -123,7 +123,7 @@ under the License.
 
       <critical-analyzer-policy>HALT</critical-analyzer-policy>
 
-      
+
       <page-sync-timeout>40000</page-sync-timeout>
 
 
@@ -160,8 +160,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -174,8 +172,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/tests/smoke-tests/src/main/resources/servers/brokerConnect/chainedMirror/serverB/broker.xml b/tests/smoke-tests/src/main/resources/servers/brokerConnect/chainedMirror/serverB/broker.xml
index 9444e5f16b..c046a54530 100644
--- a/tests/smoke-tests/src/main/resources/servers/brokerConnect/chainedMirror/serverB/broker.xml
+++ b/tests/smoke-tests/src/main/resources/servers/brokerConnect/chainedMirror/serverB/broker.xml
@@ -54,7 +54,7 @@ under the License.
       <journal-device-block-size>4096</journal-device-block-size>
 
       <journal-file-size>10M</journal-file-size>
-      
+
       <!--
        This value was determined through a calculation.
        Your system could perform 25 writes per millisecond
@@ -121,7 +121,7 @@ under the License.
 
       <critical-analyzer-policy>HALT</critical-analyzer-policy>
 
-      
+
       <page-sync-timeout>40000</page-sync-timeout>
 
 
@@ -157,8 +157,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -171,8 +169,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/tests/smoke-tests/src/main/resources/servers/brokerConnect/chainedMirror/serverRoot/broker.xml b/tests/smoke-tests/src/main/resources/servers/brokerConnect/chainedMirror/serverRoot/broker.xml
index 4950d383f7..497e775a90 100644
--- a/tests/smoke-tests/src/main/resources/servers/brokerConnect/chainedMirror/serverRoot/broker.xml
+++ b/tests/smoke-tests/src/main/resources/servers/brokerConnect/chainedMirror/serverRoot/broker.xml
@@ -54,7 +54,7 @@ under the License.
       <journal-device-block-size>4096</journal-device-block-size>
 
       <journal-file-size>10M</journal-file-size>
-      
+
       <!--
        This value was determined through a calculation.
        Your system could perform 25 writes per millisecond
@@ -115,7 +115,7 @@ under the License.
 
       <critical-analyzer-policy>HALT</critical-analyzer-policy>
 
-      
+
       <page-sync-timeout>40000</page-sync-timeout>
 
 
@@ -158,8 +158,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -172,8 +170,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/tests/smoke-tests/src/main/resources/servers/brokerConnect/mirrorSecurityA/broker.xml b/tests/smoke-tests/src/main/resources/servers/brokerConnect/mirrorSecurityA/broker.xml
index f1350dbcf0..64c0958abd 100644
--- a/tests/smoke-tests/src/main/resources/servers/brokerConnect/mirrorSecurityA/broker.xml
+++ b/tests/smoke-tests/src/main/resources/servers/brokerConnect/mirrorSecurityA/broker.xml
@@ -54,7 +54,7 @@ under the License.
       <journal-device-block-size>4096</journal-device-block-size>
 
       <journal-file-size>10M</journal-file-size>
-      
+
       <!--
        This value was determined through a calculation.
        Your system could perform 25 writes per millisecond
@@ -116,7 +116,7 @@ under the License.
 
       <critical-analyzer-policy>HALT</critical-analyzer-policy>
 
-      
+
       <page-sync-timeout>40000</page-sync-timeout>
 
 
@@ -159,8 +159,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -173,8 +171,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/tests/smoke-tests/src/main/resources/servers/brokerConnect/mirrorSecurityB/broker.xml b/tests/smoke-tests/src/main/resources/servers/brokerConnect/mirrorSecurityB/broker.xml
index 91c93d0857..741cb84c94 100644
--- a/tests/smoke-tests/src/main/resources/servers/brokerConnect/mirrorSecurityB/broker.xml
+++ b/tests/smoke-tests/src/main/resources/servers/brokerConnect/mirrorSecurityB/broker.xml
@@ -54,7 +54,7 @@ under the License.
       <journal-device-block-size>4096</journal-device-block-size>
 
       <journal-file-size>10M</journal-file-size>
-      
+
       <!--
        This value was determined through a calculation.
        Your system could perform 25 writes per millisecond
@@ -116,7 +116,7 @@ under the License.
 
       <critical-analyzer-policy>HALT</critical-analyzer-policy>
 
-      
+
       <page-sync-timeout>40000</page-sync-timeout>
 
       <broker-connections>
@@ -158,8 +158,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -172,8 +170,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/tests/smoke-tests/src/main/resources/servers/brokerConnect/pagedA/broker.xml b/tests/smoke-tests/src/main/resources/servers/brokerConnect/pagedA/broker.xml
index fd6d99e86a..f82bca3cd3 100644
--- a/tests/smoke-tests/src/main/resources/servers/brokerConnect/pagedA/broker.xml
+++ b/tests/smoke-tests/src/main/resources/servers/brokerConnect/pagedA/broker.xml
@@ -159,8 +159,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -173,8 +171,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/tests/smoke-tests/src/main/resources/servers/brokerConnect/pagedB/broker.xml b/tests/smoke-tests/src/main/resources/servers/brokerConnect/pagedB/broker.xml
index c380d38758..41d9940ebe 100644
--- a/tests/smoke-tests/src/main/resources/servers/brokerConnect/pagedB/broker.xml
+++ b/tests/smoke-tests/src/main/resources/servers/brokerConnect/pagedB/broker.xml
@@ -159,8 +159,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -173,8 +171,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/tests/smoke-tests/src/main/resources/servers/brokerConnect/qdr/broker.xml b/tests/smoke-tests/src/main/resources/servers/brokerConnect/qdr/broker.xml
index 3a6e857298..ec34f013ea 100644
--- a/tests/smoke-tests/src/main/resources/servers/brokerConnect/qdr/broker.xml
+++ b/tests/smoke-tests/src/main/resources/servers/brokerConnect/qdr/broker.xml
@@ -54,7 +54,7 @@ under the License.
       <journal-device-block-size>4096</journal-device-block-size>
 
       <journal-file-size>10M</journal-file-size>
-      
+
       <!--
        This value was determined through a calculation.
        Your system could perform 25 writes per millisecond
@@ -115,7 +115,7 @@ under the License.
 
       <critical-analyzer-policy>HALT</critical-analyzer-policy>
 
-      
+
       <page-sync-timeout>40000</page-sync-timeout>
 
 
@@ -165,8 +165,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>false</auto-create-queues>
             <auto-create-addresses>false</auto-create-addresses>
-            <auto-create-jms-queues>false</auto-create-jms-queues>
-            <auto-create-jms-topics>false</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -179,8 +177,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>false</auto-create-queues>
             <auto-create-addresses>false</auto-create-addresses>
-            <auto-create-jms-queues>false</auto-create-jms-queues>
-            <auto-create-jms-topics>false</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/tests/smoke-tests/src/main/resources/servers/brokerConnect/replicaBackupServerA/broker.xml b/tests/smoke-tests/src/main/resources/servers/brokerConnect/replicaBackupServerA/broker.xml
index 5ff9742610..153446194b 100644
--- a/tests/smoke-tests/src/main/resources/servers/brokerConnect/replicaBackupServerA/broker.xml
+++ b/tests/smoke-tests/src/main/resources/servers/brokerConnect/replicaBackupServerA/broker.xml
@@ -101,8 +101,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -117,8 +115,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/tests/smoke-tests/src/main/resources/servers/brokerConnect/replicaBackupServerB/broker.xml b/tests/smoke-tests/src/main/resources/servers/brokerConnect/replicaBackupServerB/broker.xml
index 76f48ecc46..424e670d9c 100644
--- a/tests/smoke-tests/src/main/resources/servers/brokerConnect/replicaBackupServerB/broker.xml
+++ b/tests/smoke-tests/src/main/resources/servers/brokerConnect/replicaBackupServerB/broker.xml
@@ -101,8 +101,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -117,8 +115,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/tests/smoke-tests/src/main/resources/servers/brokerConnect/replicaMainServerA/broker.xml b/tests/smoke-tests/src/main/resources/servers/brokerConnect/replicaMainServerA/broker.xml
index e204ad660e..5a75bf975e 100644
--- a/tests/smoke-tests/src/main/resources/servers/brokerConnect/replicaMainServerA/broker.xml
+++ b/tests/smoke-tests/src/main/resources/servers/brokerConnect/replicaMainServerA/broker.xml
@@ -98,8 +98,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -114,8 +112,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/tests/smoke-tests/src/main/resources/servers/brokerConnect/replicaMainServerB/broker.xml b/tests/smoke-tests/src/main/resources/servers/brokerConnect/replicaMainServerB/broker.xml
index 81383de43a..1d635cebd3 100644
--- a/tests/smoke-tests/src/main/resources/servers/brokerConnect/replicaMainServerB/broker.xml
+++ b/tests/smoke-tests/src/main/resources/servers/brokerConnect/replicaMainServerB/broker.xml
@@ -98,8 +98,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -114,8 +112,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/tests/smoke-tests/src/main/resources/servers/brokerConnect/serverA/broker.xml b/tests/smoke-tests/src/main/resources/servers/brokerConnect/serverA/broker.xml
index 91bc46aa14..e0d5ba79f3 100644
--- a/tests/smoke-tests/src/main/resources/servers/brokerConnect/serverA/broker.xml
+++ b/tests/smoke-tests/src/main/resources/servers/brokerConnect/serverA/broker.xml
@@ -54,7 +54,7 @@ under the License.
       <journal-device-block-size>4096</journal-device-block-size>
 
       <journal-file-size>10M</journal-file-size>
-      
+
       <!--
        This value was determined through a calculation.
        Your system could perform 25 writes per millisecond
@@ -115,7 +115,7 @@ under the License.
 
       <critical-analyzer-policy>HALT</critical-analyzer-policy>
 
-      
+
       <page-sync-timeout>40000</page-sync-timeout>
 
 
@@ -159,8 +159,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -173,8 +171,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/tests/smoke-tests/src/main/resources/servers/brokerConnect/serverB/broker.xml b/tests/smoke-tests/src/main/resources/servers/brokerConnect/serverB/broker.xml
index bb3b6b415a..5c2ceb99ff 100644
--- a/tests/smoke-tests/src/main/resources/servers/brokerConnect/serverB/broker.xml
+++ b/tests/smoke-tests/src/main/resources/servers/brokerConnect/serverB/broker.xml
@@ -54,7 +54,7 @@ under the License.
       <journal-device-block-size>4096</journal-device-block-size>
 
       <journal-file-size>10M</journal-file-size>
-      
+
       <!--
        This value was determined through a calculation.
        Your system could perform 25 writes per millisecond
@@ -116,7 +116,7 @@ under the License.
 
       <critical-analyzer-policy>HALT</critical-analyzer-policy>
 
-      
+
       <page-sync-timeout>40000</page-sync-timeout>
 
 
@@ -124,7 +124,7 @@ under the License.
          <acceptor name="artemis">tcp://0.0.0.0:61616?tcpSendBufferSize=1048576;tcpReceiveBufferSize=1048576;amqpMinLargeMessageSize=102400;protocols=CORE,AMQP,STOMP,HORNETQ,MQTT,OPENWIRE;useEpoll=true;amqpCredits=1000;amqpLowCredits=300;amqpDuplicateDetection=true</acceptor>
       </acceptors>
 
-      
+
       <broker-connections>
          <amqp-connection uri="tcp://serverA:61616" name="serverA" user="artemis" password="artemis" retry-interval="100" reconnect-attempts="-1">
             <mirror durable="true"/>
@@ -159,8 +159,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -173,8 +171,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/tests/smoke-tests/src/main/resources/servers/brokerConnect/splitMirror/serverA/broker.xml b/tests/smoke-tests/src/main/resources/servers/brokerConnect/splitMirror/serverA/broker.xml
index a911d8271e..d565203d99 100644
--- a/tests/smoke-tests/src/main/resources/servers/brokerConnect/splitMirror/serverA/broker.xml
+++ b/tests/smoke-tests/src/main/resources/servers/brokerConnect/splitMirror/serverA/broker.xml
@@ -56,7 +56,7 @@ under the License.
       <journal-device-block-size>4096</journal-device-block-size>
 
       <journal-file-size>10M</journal-file-size>
-      
+
       <!--
        This value was determined through a calculation.
        Your system could perform 25 writes per millisecond
@@ -117,7 +117,7 @@ under the License.
 
       <critical-analyzer-policy>HALT</critical-analyzer-policy>
 
-      
+
       <page-sync-timeout>40000</page-sync-timeout>
 
 
@@ -154,8 +154,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -168,8 +166,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/tests/smoke-tests/src/main/resources/servers/brokerConnect/splitMirror/serverB/broker.xml b/tests/smoke-tests/src/main/resources/servers/brokerConnect/splitMirror/serverB/broker.xml
index 495edf8029..1a0305f7d3 100644
--- a/tests/smoke-tests/src/main/resources/servers/brokerConnect/splitMirror/serverB/broker.xml
+++ b/tests/smoke-tests/src/main/resources/servers/brokerConnect/splitMirror/serverB/broker.xml
@@ -54,7 +54,7 @@ under the License.
       <journal-device-block-size>4096</journal-device-block-size>
 
       <journal-file-size>10M</journal-file-size>
-      
+
       <!--
        This value was determined through a calculation.
        Your system could perform 25 writes per millisecond
@@ -116,7 +116,7 @@ under the License.
 
       <critical-analyzer-policy>HALT</critical-analyzer-policy>
 
-      
+
       <page-sync-timeout>40000</page-sync-timeout>
 
 
@@ -152,8 +152,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -166,8 +164,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/tests/smoke-tests/src/main/resources/servers/brokerConnect/splitMirror/serverRoot/broker.xml b/tests/smoke-tests/src/main/resources/servers/brokerConnect/splitMirror/serverRoot/broker.xml
index 067bb688c6..6ed89767be 100644
--- a/tests/smoke-tests/src/main/resources/servers/brokerConnect/splitMirror/serverRoot/broker.xml
+++ b/tests/smoke-tests/src/main/resources/servers/brokerConnect/splitMirror/serverRoot/broker.xml
@@ -54,7 +54,7 @@ under the License.
       <journal-device-block-size>4096</journal-device-block-size>
 
       <journal-file-size>10M</journal-file-size>
-      
+
       <!--
        This value was determined through a calculation.
        Your system could perform 25 writes per millisecond
@@ -115,7 +115,7 @@ under the License.
 
       <critical-analyzer-policy>HALT</critical-analyzer-policy>
 
-      
+
       <page-sync-timeout>40000</page-sync-timeout>
 
 
@@ -161,8 +161,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -175,8 +173,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/tests/smoke-tests/src/main/resources/servers/dnsswitch-replicated-backup-withping/broker.xml b/tests/smoke-tests/src/main/resources/servers/dnsswitch-replicated-backup-withping/broker.xml
index bb08ea592c..b0097eddb9 100644
--- a/tests/smoke-tests/src/main/resources/servers/dnsswitch-replicated-backup-withping/broker.xml
+++ b/tests/smoke-tests/src/main/resources/servers/dnsswitch-replicated-backup-withping/broker.xml
@@ -103,8 +103,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -119,8 +117,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/tests/smoke-tests/src/main/resources/servers/dnsswitch-replicated-backup/broker.xml b/tests/smoke-tests/src/main/resources/servers/dnsswitch-replicated-backup/broker.xml
index b24398eb75..2c03b34989 100644
--- a/tests/smoke-tests/src/main/resources/servers/dnsswitch-replicated-backup/broker.xml
+++ b/tests/smoke-tests/src/main/resources/servers/dnsswitch-replicated-backup/broker.xml
@@ -99,8 +99,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -115,8 +113,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/tests/smoke-tests/src/main/resources/servers/dnsswitch-replicated-main-noretrydns/broker.xml b/tests/smoke-tests/src/main/resources/servers/dnsswitch-replicated-main-noretrydns/broker.xml
index 44029f6a0b..41b1f8334c 100644
--- a/tests/smoke-tests/src/main/resources/servers/dnsswitch-replicated-main-noretrydns/broker.xml
+++ b/tests/smoke-tests/src/main/resources/servers/dnsswitch-replicated-main-noretrydns/broker.xml
@@ -97,8 +97,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -113,8 +111,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/tests/smoke-tests/src/main/resources/servers/dnsswitch-replicated-main-withping/broker.xml b/tests/smoke-tests/src/main/resources/servers/dnsswitch-replicated-main-withping/broker.xml
index 174e8d3133..10fc57e74b 100644
--- a/tests/smoke-tests/src/main/resources/servers/dnsswitch-replicated-main-withping/broker.xml
+++ b/tests/smoke-tests/src/main/resources/servers/dnsswitch-replicated-main-withping/broker.xml
@@ -103,8 +103,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -119,8 +117,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/tests/smoke-tests/src/main/resources/servers/dnsswitch-replicated-main/broker.xml b/tests/smoke-tests/src/main/resources/servers/dnsswitch-replicated-main/broker.xml
index 44029f6a0b..41b1f8334c 100644
--- a/tests/smoke-tests/src/main/resources/servers/dnsswitch-replicated-main/broker.xml
+++ b/tests/smoke-tests/src/main/resources/servers/dnsswitch-replicated-main/broker.xml
@@ -97,8 +97,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -113,8 +111,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/tests/smoke-tests/src/main/resources/servers/dnsswitch/broker.xml b/tests/smoke-tests/src/main/resources/servers/dnsswitch/broker.xml
index de9a37e7d2..04f7a671f8 100644
--- a/tests/smoke-tests/src/main/resources/servers/dnsswitch/broker.xml
+++ b/tests/smoke-tests/src/main/resources/servers/dnsswitch/broker.xml
@@ -144,8 +144,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -159,8 +157,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/tests/smoke-tests/src/main/resources/servers/dnsswitch2/broker.xml b/tests/smoke-tests/src/main/resources/servers/dnsswitch2/broker.xml
index 7dd8850201..19eac82efd 100644
--- a/tests/smoke-tests/src/main/resources/servers/dnsswitch2/broker.xml
+++ b/tests/smoke-tests/src/main/resources/servers/dnsswitch2/broker.xml
@@ -144,8 +144,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -159,8 +157,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/tests/smoke-tests/src/main/resources/servers/expire/broker.xml b/tests/smoke-tests/src/main/resources/servers/expire/broker.xml
index a481c3f64b..2d9996147d 100644
--- a/tests/smoke-tests/src/main/resources/servers/expire/broker.xml
+++ b/tests/smoke-tests/src/main/resources/servers/expire/broker.xml
@@ -148,8 +148,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -162,8 +160,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/tests/smoke-tests/src/main/resources/servers/jmx-failback1/broker.xml b/tests/smoke-tests/src/main/resources/servers/jmx-failback1/broker.xml
index a50a204f22..0d5ac202bc 100644
--- a/tests/smoke-tests/src/main/resources/servers/jmx-failback1/broker.xml
+++ b/tests/smoke-tests/src/main/resources/servers/jmx-failback1/broker.xml
@@ -195,8 +195,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -209,8 +207,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/tests/smoke-tests/src/main/resources/servers/jmx-failback2/broker.xml b/tests/smoke-tests/src/main/resources/servers/jmx-failback2/broker.xml
index b53074494c..47a5297782 100644
--- a/tests/smoke-tests/src/main/resources/servers/jmx-failback2/broker.xml
+++ b/tests/smoke-tests/src/main/resources/servers/jmx-failback2/broker.xml
@@ -194,8 +194,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -208,8 +206,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/tests/smoke-tests/src/main/resources/servers/maxConsumers/broker.xml b/tests/smoke-tests/src/main/resources/servers/maxConsumers/broker.xml
index ffb043a971..6b2b70c3a4 100644
--- a/tests/smoke-tests/src/main/resources/servers/maxConsumers/broker.xml
+++ b/tests/smoke-tests/src/main/resources/servers/maxConsumers/broker.xml
@@ -148,8 +148,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -162,8 +160,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <address-setting match="myQueue">
             <dead-letter-address>DLQ</dead-letter-address>
@@ -176,8 +172,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/tests/smoke-tests/src/main/resources/servers/mmfactory/broker.xml b/tests/smoke-tests/src/main/resources/servers/mmfactory/broker.xml
index 71e4e32f8f..24d9c1a121 100644
--- a/tests/smoke-tests/src/main/resources/servers/mmfactory/broker.xml
+++ b/tests/smoke-tests/src/main/resources/servers/mmfactory/broker.xml
@@ -193,8 +193,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -209,8 +207,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/tests/smoke-tests/src/main/resources/servers/mqtt/broker.xml b/tests/smoke-tests/src/main/resources/servers/mqtt/broker.xml
index 22ca563441..6e8b24d88e 100644
--- a/tests/smoke-tests/src/main/resources/servers/mqtt/broker.xml
+++ b/tests/smoke-tests/src/main/resources/servers/mqtt/broker.xml
@@ -161,8 +161,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -176,8 +174,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/tests/smoke-tests/src/main/resources/servers/nettynative/broker.xml b/tests/smoke-tests/src/main/resources/servers/nettynative/broker.xml
index f0489ac8d9..cd0b7b743e 100644
--- a/tests/smoke-tests/src/main/resources/servers/nettynative/broker.xml
+++ b/tests/smoke-tests/src/main/resources/servers/nettynative/broker.xml
@@ -46,7 +46,7 @@ under the License.
 
       <large-messages-directory>./data/large-messages</large-messages-directory>
 
-      
+
       <!-- if you want to retain your journal uncomment this following configuration.
 
       This will allow your system to keep 7 days of your data, up to 10G. Tweak it accordingly to your use case and capacity.
@@ -113,7 +113,7 @@ under the License.
 
       <critical-analyzer-policy>HALT</critical-analyzer-policy>
 
-      
+
 
             <!-- the system will enter into page mode once you hit this limit.
            This is an estimate in bytes of how much the messages are using in memory
@@ -186,8 +186,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -200,8 +198,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
             <auto-delete-queues>false</auto-delete-queues>
             <auto-delete-addresses>false</auto-delete-addresses>
          </address-setting>
diff --git a/tests/smoke-tests/src/main/resources/servers/paging/broker.xml b/tests/smoke-tests/src/main/resources/servers/paging/broker.xml
index bbe3b880ef..0edfd3dd05 100644
--- a/tests/smoke-tests/src/main/resources/servers/paging/broker.xml
+++ b/tests/smoke-tests/src/main/resources/servers/paging/broker.xml
@@ -148,8 +148,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -163,8 +161,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/tests/smoke-tests/src/main/resources/servers/replicated-failback-master1/broker.xml b/tests/smoke-tests/src/main/resources/servers/replicated-failback-master1/broker.xml
index 656eac8b29..8602c96122 100644
--- a/tests/smoke-tests/src/main/resources/servers/replicated-failback-master1/broker.xml
+++ b/tests/smoke-tests/src/main/resources/servers/replicated-failback-master1/broker.xml
@@ -101,8 +101,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -117,8 +115,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/tests/smoke-tests/src/main/resources/servers/replicated-failback-master2/broker.xml b/tests/smoke-tests/src/main/resources/servers/replicated-failback-master2/broker.xml
index 4a692aefe8..6b5c0ff6b1 100644
--- a/tests/smoke-tests/src/main/resources/servers/replicated-failback-master2/broker.xml
+++ b/tests/smoke-tests/src/main/resources/servers/replicated-failback-master2/broker.xml
@@ -102,8 +102,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -118,8 +116,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/tests/smoke-tests/src/main/resources/servers/replicated-failback-master3/broker.xml b/tests/smoke-tests/src/main/resources/servers/replicated-failback-master3/broker.xml
index c9852abc3f..1408ec4966 100644
--- a/tests/smoke-tests/src/main/resources/servers/replicated-failback-master3/broker.xml
+++ b/tests/smoke-tests/src/main/resources/servers/replicated-failback-master3/broker.xml
@@ -102,8 +102,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -118,8 +116,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/tests/smoke-tests/src/main/resources/servers/replicated-failback-slave1/broker.xml b/tests/smoke-tests/src/main/resources/servers/replicated-failback-slave1/broker.xml
index 601f3fd4b1..8beeb2d970 100644
--- a/tests/smoke-tests/src/main/resources/servers/replicated-failback-slave1/broker.xml
+++ b/tests/smoke-tests/src/main/resources/servers/replicated-failback-slave1/broker.xml
@@ -101,8 +101,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -117,8 +115,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/tests/smoke-tests/src/main/resources/servers/replicated-static0/broker.xml b/tests/smoke-tests/src/main/resources/servers/replicated-static0/broker.xml
index f96eaa9db6..3fdc63237e 100644
--- a/tests/smoke-tests/src/main/resources/servers/replicated-static0/broker.xml
+++ b/tests/smoke-tests/src/main/resources/servers/replicated-static0/broker.xml
@@ -93,8 +93,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -109,8 +107,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/tests/smoke-tests/src/main/resources/servers/replicated-static1/broker.xml b/tests/smoke-tests/src/main/resources/servers/replicated-static1/broker.xml
index 779b428dca..07445a7a4d 100644
--- a/tests/smoke-tests/src/main/resources/servers/replicated-static1/broker.xml
+++ b/tests/smoke-tests/src/main/resources/servers/replicated-static1/broker.xml
@@ -95,8 +95,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -111,8 +109,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/tests/smoke-tests/src/main/resources/servers/zkReplicationBackup/broker.xml b/tests/smoke-tests/src/main/resources/servers/zkReplicationBackup/broker.xml
index 8b97bf9831..9634984915 100644
--- a/tests/smoke-tests/src/main/resources/servers/zkReplicationBackup/broker.xml
+++ b/tests/smoke-tests/src/main/resources/servers/zkReplicationBackup/broker.xml
@@ -102,8 +102,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -118,8 +116,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/tests/smoke-tests/src/main/resources/servers/zkReplicationPrimary/broker.xml b/tests/smoke-tests/src/main/resources/servers/zkReplicationPrimary/broker.xml
index 75b9e7405f..7bb332fd0e 100644
--- a/tests/smoke-tests/src/main/resources/servers/zkReplicationPrimary/broker.xml
+++ b/tests/smoke-tests/src/main/resources/servers/zkReplicationPrimary/broker.xml
@@ -100,8 +100,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -116,8 +114,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/tests/smoke-tests/src/main/resources/servers/zkReplicationPrimaryPeerA/broker.xml b/tests/smoke-tests/src/main/resources/servers/zkReplicationPrimaryPeerA/broker.xml
index 9c2567d509..a130f712a4 100644
--- a/tests/smoke-tests/src/main/resources/servers/zkReplicationPrimaryPeerA/broker.xml
+++ b/tests/smoke-tests/src/main/resources/servers/zkReplicationPrimaryPeerA/broker.xml
@@ -102,8 +102,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -118,8 +116,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>
 
diff --git a/tests/smoke-tests/src/main/resources/servers/zkReplicationPrimaryPeerB/broker.xml b/tests/smoke-tests/src/main/resources/servers/zkReplicationPrimaryPeerB/broker.xml
index 3db6ead7a1..4e4b7e8831 100644
--- a/tests/smoke-tests/src/main/resources/servers/zkReplicationPrimaryPeerB/broker.xml
+++ b/tests/smoke-tests/src/main/resources/servers/zkReplicationPrimaryPeerB/broker.xml
@@ -102,8 +102,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
          <!--default for catch all-->
          <address-setting match="#">
@@ -118,8 +116,6 @@ under the License.
             <address-full-policy>PAGE</address-full-policy>
             <auto-create-queues>true</auto-create-queues>
             <auto-create-addresses>true</auto-create-addresses>
-            <auto-create-jms-queues>true</auto-create-jms-queues>
-            <auto-create-jms-topics>true</auto-create-jms-topics>
          </address-setting>
       </address-settings>