diff --git a/activemq-core/src/test/java/org/apache/activemq/broker/ft/TransactedTopicMasterSlaveTest.java b/activemq-core/src/test/java/org/apache/activemq/broker/ft/TransactedTopicMasterSlaveTest.java
new file mode 100644
index 0000000000..40d811c875
--- /dev/null
+++ b/activemq-core/src/test/java/org/apache/activemq/broker/ft/TransactedTopicMasterSlaveTest.java
@@ -0,0 +1,90 @@
+/**
+ * 
+ * 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.
+ */
+package org.apache.activemq.broker.ft;
+
+import java.io.File;
+import java.net.URISyntaxException;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.JmsTopicTransactionTest;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.store.kahadaptor.KahaPersistentAdaptor;
+import org.apache.activemq.test.JmsResourceProvider;
+/**
+ * Test failover for Queues
+ * 
+ */
+public class TransactedTopicMasterSlaveTest extends JmsTopicTransactionTest{
+    protected BrokerService slave;
+    protected int inflightMessageCount=0;
+    protected int failureCount=50;
+    protected String uriString="failover://(tcp://localhost:62001,tcp://localhost:62002)?randomize=false";
+
+    protected void setUp() throws Exception{
+        failureCount=super.batchCount/2;
+        // this will create the main (or master broker)
+        broker=createBroker();
+        broker.start();
+        KahaPersistentAdaptor adaptor=new KahaPersistentAdaptor(new File("activemq-data/slave"));
+        slave = new BrokerService();
+        slave.setBrokerName("slave");
+        slave.setPersistenceAdapter(adaptor);
+        slave.addConnector("tcp://localhost:62002");
+        slave.setDeleteAllMessagesOnStartup(true);
+        slave.setMasterConnectorURI("tcp://localhost:62001");
+        slave.start();
+        // wait for thing to connect
+        Thread.sleep(1000);
+        resourceProvider=getJmsResourceProvider();
+        topic=resourceProvider.isTopic();
+        // We will be using transacted sessions.
+        resourceProvider.setTransacted(true);
+        connectionFactory=resourceProvider.createConnectionFactory();
+        reconnect();
+    }
+
+    protected void tearDown() throws Exception{
+        slave.stop();
+        super.tearDown();
+    }
+
+    protected BrokerService createBroker() throws Exception,URISyntaxException{
+        BrokerService broker=new BrokerService();
+        broker.setBrokerName("master");
+        KahaPersistentAdaptor adaptor=new KahaPersistentAdaptor(new File("activemq-data/master"));
+        broker.setPersistenceAdapter(adaptor);
+        broker.addConnector("tcp://localhost:62001");
+        broker.setDeleteAllMessagesOnStartup(true);
+        return broker;
+    }
+
+    protected JmsResourceProvider getJmsResourceProvider(){
+        JmsResourceProvider p=super.getJmsResourceProvider();
+        p.setServerUri(uriString);
+        return p;
+    }
+
+    protected ActiveMQConnectionFactory createConnectionFactory() throws Exception{
+        return new ActiveMQConnectionFactory(uriString);
+    }
+
+    protected void messageSent() throws Exception{
+        if(true)
+            return;
+        if(++inflightMessageCount>=failureCount){
+            inflightMessageCount=0;
+            Thread.sleep(1000);
+            broker.stop();
+        }
+    }
+}