diff --git a/activemq-core/src/test/resources/org/apache/activemq/broker/virtual/composite-queue.xml b/activemq-core/src/test/resources/org/apache/activemq/broker/virtual/composite-queue.xml
index 28337c6e27..fb241751fb 100644
--- a/activemq-core/src/test/resources/org/apache/activemq/broker/virtual/composite-queue.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/broker/virtual/composite-queue.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright 2005-2006 The Apache Software Foundation
-   
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-   
-    http://www.apache.org/licenses/LICENSE-2.0
-   
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+  Copyright 2005-2006 The Apache Software Foundation
+  
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
 -->
 
 <!-- this file can only be parsed using the xbean-spring library -->
 <!-- START SNIPPET: xbean -->
 <beans>
 
-  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />
 
   <broker xmlns="http://activemq.org/config/1.0">
     <destinationInterceptors>
@@ -27,13 +27,13 @@
         <virtualDestinations>
           <compositeQueue name="MY.QUEUE">
             <forwardTo>
-              <queue physicalName="FOO"/>
-              <topic physicalName="BAR"/>
+              <queue physicalName="FOO" />
+              <topic physicalName="BAR" />
             </forwardTo>
           </compositeQueue>
         </virtualDestinations>
       </virtualDestinationInterceptor>
-      </destinationInterceptors>
+    </destinationInterceptors>
 
   </broker>
 
diff --git a/activemq-core/src/test/resources/org/apache/activemq/broker/virtual/composite-topic.xml b/activemq-core/src/test/resources/org/apache/activemq/broker/virtual/composite-topic.xml
index 2ade669e5d..47d851cc9d 100644
--- a/activemq-core/src/test/resources/org/apache/activemq/broker/virtual/composite-topic.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/broker/virtual/composite-topic.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright 2005-2006 The Apache Software Foundation
-   
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-   
-    http://www.apache.org/licenses/LICENSE-2.0
-   
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+  Copyright 2005-2006 The Apache Software Foundation
+  
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
 -->
 
 <!-- this file can only be parsed using the xbean-spring library -->
 <!-- START SNIPPET: xbean -->
 <beans>
 
-  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />
 
   <broker xmlns="http://activemq.org/config/1.0">
     <destinationInterceptors>
@@ -27,13 +27,13 @@
         <virtualDestinations>
           <compositeTopic name="MY.TOPIC">
             <forwardTo>
-              <queue physicalName="FOO"/>
-              <topic physicalName="BAR"/>
+              <queue physicalName="FOO" />
+              <topic physicalName="BAR" />
             </forwardTo>
           </compositeTopic>
         </virtualDestinations>
       </virtualDestinationInterceptor>
-      </destinationInterceptors>
+    </destinationInterceptors>
 
   </broker>
 
diff --git a/activemq-core/src/test/resources/org/apache/activemq/broker/virtual/global-virtual-topics.xml b/activemq-core/src/test/resources/org/apache/activemq/broker/virtual/global-virtual-topics.xml
index 67b5f5823e..c30cfda7e6 100644
--- a/activemq-core/src/test/resources/org/apache/activemq/broker/virtual/global-virtual-topics.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/broker/virtual/global-virtual-topics.xml
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright 2005-2006 The Apache Software Foundation
-   
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-   
-    http://www.apache.org/licenses/LICENSE-2.0
-   
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+  Copyright 2005-2006 The Apache Software Foundation
+  
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
 -->
 
 <!-- this file can only be parsed using the xbean-spring library -->
 <!-- START SNIPPET: xbean -->
 <beans>
 
-  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />
 
   <broker xmlns="http://activemq.org/config/1.0">
     <destinationInterceptors>
       <virtualDestinationInterceptor>
         <virtualDestinations>
-          <virtualTopic name=">" prefix="VirtualTopicConsumers.*."/>
+          <virtualTopic name=">" prefix="VirtualTopicConsumers.*." />
         </virtualDestinations>
       </virtualDestinationInterceptor>
-      </destinationInterceptors>
+    </destinationInterceptors>
 
   </broker>