diff --git a/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveTest.java b/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveTest.java
index 76c899af6d..d1ad3eeb2a 100644
--- a/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveTest.java
+++ b/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveTest.java
@@ -68,6 +68,7 @@ public class TwoBrokerTopicSendReceiveTest extends JmsTopicSendReceiveWithTwoCon
 
             BrokerService broker = brokerFactory.getBroker();
             ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory(((TransportConnector)broker.getTransportConnectors().get(0)).getConnectUri());
+            factory.setUseEmbeddedBroker(false);
 
             return factory;
 
diff --git a/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveUsingJavaConfigurationTest.java b/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveUsingJavaConfigurationTest.java
index 0022d5e3b6..098ab2efc1 100644
--- a/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveUsingJavaConfigurationTest.java
+++ b/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveUsingJavaConfigurationTest.java
@@ -39,6 +39,7 @@ public class TwoBrokerTopicSendReceiveUsingJavaConfigurationTest extends TwoBrok
             receiveBroker.start();
 
             ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory("tcp://localhost:62002");
+            factory.setUseEmbeddedBroker(false);
             return factory;
         } catch (Exception e) {
             e.printStackTrace();
@@ -55,6 +56,7 @@ public class TwoBrokerTopicSendReceiveUsingJavaConfigurationTest extends TwoBrok
             sendBroker.start();
 
             ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory("tcp://localhost:62001");
+            factory.setUseEmbeddedBroker(false);
             return factory;
         } catch (Exception e) {
             e.printStackTrace();
diff --git a/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveUsingTcpTest.java b/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveUsingTcpTest.java
new file mode 100644
index 0000000000..3064762ca5
--- /dev/null
+++ b/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveUsingTcpTest.java
@@ -0,0 +1,87 @@
+/** 
+ * 
+ * Copyright 2004 Protique Ltd
+ * 
+ * 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. 
+ * 
+ **/
+package org.activemq.usecases;
+
+import javax.jms.JMSException;
+
+import org.activemq.ActiveMQConnectionFactory;
+import org.activemq.xbean.BrokerFactoryBean;
+import org.activemq.broker.BrokerService;
+import org.activemq.broker.TransportConnector;
+import org.springframework.core.io.ClassPathResource;
+
+import java.io.IOException;
+import java.net.URISyntaxException;
+
+/**
+ * @version $Revision: 1.1.1.1 $
+ */
+public class TwoBrokerTopicSendReceiveUsingTcpTest extends TwoBrokerTopicSendReceiveTest {
+    private BrokerService receiverBroker;
+    private BrokerService senderBroker;
+
+    protected void setUp() throws Exception {
+        BrokerFactoryBean brokerFactory;
+
+        brokerFactory = new BrokerFactoryBean(new ClassPathResource("org/activemq/usecases/receiver.xml"));
+        brokerFactory.afterPropertiesSet();
+        receiverBroker = brokerFactory.getBroker();
+
+        brokerFactory = new BrokerFactoryBean(new ClassPathResource("org/activemq/usecases/sender.xml"));
+        brokerFactory.afterPropertiesSet();
+        senderBroker = brokerFactory.getBroker();
+
+        super.setUp();
+        Thread.sleep(2000);
+    }
+
+    protected void tearDown() throws Exception {
+        super.tearDown();
+
+        if (receiverBroker != null) {
+            receiverBroker.stop();
+        }
+        if (senderBroker != null) {
+            senderBroker.stop();
+        }
+    }
+
+    
+    protected ActiveMQConnectionFactory createReceiverConnectionFactory() throws JMSException {
+        try {
+            ActiveMQConnectionFactory fac =  new ActiveMQConnectionFactory(((TransportConnector)receiverBroker.getTransportConnectors().get(0)).getConnectUri());
+            fac.setUseEmbeddedBroker(false);
+            return fac;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    protected ActiveMQConnectionFactory createSenderConnectionFactory() throws JMSException {
+        try {
+            ActiveMQConnectionFactory fac = new ActiveMQConnectionFactory(((TransportConnector)senderBroker.getTransportConnectors().get(0)).getConnectUri());
+            fac.setUseEmbeddedBroker(false);
+            return fac;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+
+    }
+}