diff --git a/activemq-core/pom.xml b/activemq-core/pom.xml
index b079f80f69..78d7f9bd41 100755
--- a/activemq-core/pom.xml
+++ b/activemq-core/pom.xml
@@ -516,9 +516,6 @@
             <exclude>**/QueueConsumerCloseAndReconnectTest.*</exclude>
             <exclude>**/TwoBrokerMulticastQueueTest.*</exclude>
 
-            <!-- TODO move to optional module...  -->
-            <exclude>**/TwoBrokerTopicSendReceiveUsingHttpTest.*</exclude>
-
             <!-- This test only works on machines which have ssh propertly configured -->
             <exclude>**/SSHTunnelNetworkReconnectTest.*</exclude>
 
@@ -1152,9 +1149,6 @@
                 <exclude>**/QueueConsumerCloseAndReconnectTest.*</exclude>
                 <exclude>**/TwoBrokerMulticastQueueTest.*</exclude>
 
-                <!-- TODO move to optional module...  -->
-                <exclude>**/TwoBrokerTopicSendReceiveUsingHttpTest.*</exclude>
-
                 <!-- This test only works on machines which have ssh propertly configured -->
                 <exclude>**/SSHTunnelNetworkReconnectTest.*</exclude>
 
diff --git a/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-2.xml b/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-2.xml
index b97ddb02b0..48cc372afb 100644
--- a/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-2.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-2.xml
@@ -15,7 +15,12 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans>
+<beans
+  xmlns="http://www.springframework.org/schema/beans"
+  xmlns:amq="http://activemq.apache.org/schema/core"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
 
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
diff --git a/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingHttpTest.java b/activemq-optional/src/test/java/org/apache/activemq/TwoBrokerTopicSendReceiveUsingHttpTest.java
similarity index 93%
rename from activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingHttpTest.java
rename to activemq-optional/src/test/java/org/apache/activemq/TwoBrokerTopicSendReceiveUsingHttpTest.java
index 361e8f5ab9..cb412c6cfb 100644
--- a/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingHttpTest.java
+++ b/activemq-optional/src/test/java/org/apache/activemq/TwoBrokerTopicSendReceiveUsingHttpTest.java
@@ -14,11 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.usecases;
+package org.apache.activemq;
 
 import javax.jms.JMSException;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.usecases.TwoBrokerTopicSendReceiveTest;
 
 /**
  *