diff --git a/activemq-core/src/test/java/org/apache/activemq/broker/store/AMQStoreLoadTester.java b/activemq-core/src/test/java/org/apache/activemq/broker/store/AMQStoreLoadTester.java
deleted file mode 100644
index f8111824ac..0000000000
--- a/activemq-core/src/test/java/org/apache/activemq/broker/store/AMQStoreLoadTester.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.store;
-
-import junit.framework.Test;
-import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.store.amq.AMQPersistenceAdapter;
-
-/**
- * 
- * @version $Revision$
- */
-public class AMQStoreLoadTester extends LoadTester  {
-
-    protected BrokerService createBroker() throws Exception {
-        BrokerService broker = new BrokerService();
-        AMQPersistenceAdapter adaptor = new AMQPersistenceAdapter();
-        broker.setPersistenceAdapter(adaptor);
-        broker.addConnector("tcp://localhost:0");
-        broker.setDeleteAllMessagesOnStartup(true);
-        return broker;
-    }
-    
-    public static Test suite() {
-        return suite(AMQStoreLoadTester.class);
-    }
-    
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
-    }
-    
-}
diff --git a/activemq-core/src/test/java/org/apache/activemq/broker/store/AMQStoreRecoveryBrokerTest.java b/activemq-core/src/test/java/org/apache/activemq/broker/store/AMQStoreRecoveryBrokerTest.java
deleted file mode 100644
index 1d09800ada..0000000000
--- a/activemq-core/src/test/java/org/apache/activemq/broker/store/AMQStoreRecoveryBrokerTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.store;
-
-import junit.framework.Test;
-import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.broker.RecoveryBrokerTest;
-import org.apache.activemq.store.amq.AMQPersistenceAdapter;
-
-/**
- * Used to verify that recovery works correctly against 
- * 
- * @version $Revision$
- */
-public class AMQStoreRecoveryBrokerTest extends RecoveryBrokerTest {
-
-    protected BrokerService createBroker() throws Exception {
-        BrokerService service = new BrokerService();
-        service.setDeleteAllMessagesOnStartup(true);
-        AMQPersistenceAdapter pa = new AMQPersistenceAdapter();
-        service.setPersistenceAdapter(pa);
-        return service;
-    }
-    
-    protected BrokerService createRestartedBroker() throws Exception {
-        BrokerService service = new BrokerService();
-        AMQPersistenceAdapter pa = new AMQPersistenceAdapter();
-        service.setPersistenceAdapter(pa);
-        return service;
-    }
-    
-    public static Test suite() {
-        return suite(AMQStoreRecoveryBrokerTest.class);
-    }
-    
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
-    }
-
-    
-//    @Override
-//    public void testTopicDurableConsumerHoldsPersistentMessageAfterRestart() throws Exception {
-//    	// TODO: this test is currently failing in base class.. overriden to avoid failure
-//    }
-//    
-//    @Override
-//    public void testQueuePersistentCommitedAcksNotLostOnRestart() throws Exception {
-//    	// TODO: this test is currently failing in base class.. overriden to avoid failure
-//    }
-    
-}
diff --git a/activemq-core/src/test/java/org/apache/activemq/broker/store/AMQStoreXARecoveryBrokerTest.java b/activemq-core/src/test/java/org/apache/activemq/broker/store/AMQStoreXARecoveryBrokerTest.java
deleted file mode 100644
index 0720794475..0000000000
--- a/activemq-core/src/test/java/org/apache/activemq/broker/store/AMQStoreXARecoveryBrokerTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.store;
-
-import junit.framework.Test;
-
-import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.broker.XARecoveryBrokerTest;
-import org.apache.activemq.store.amq.AMQPersistenceAdapter;
-
-
-/**
- * Used to verify that recovery works correctly against 
- * 
- * @version $Revision$
- */
-public class AMQStoreXARecoveryBrokerTest extends XARecoveryBrokerTest {
-
-    public static Test suite() {
-        return suite(AMQStoreXARecoveryBrokerTest.class);
-    }
-    
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
-    }
-
-    protected BrokerService createBroker() throws Exception {
-        BrokerService service = new BrokerService();
-        service.setDeleteAllMessagesOnStartup(true);
-        AMQPersistenceAdapter pa = new AMQPersistenceAdapter();
-        service.setPersistenceAdapter(pa);
-        return service;
-    }
-    
-    protected BrokerService createRestartedBroker() throws Exception {
-        BrokerService service = new BrokerService();
-        AMQPersistenceAdapter pa = new AMQPersistenceAdapter();
-        service.setPersistenceAdapter(pa);
-        return service;
-    }
-    
-}
diff --git a/activemq-core/src/test/java/org/apache/activemq/broker/store/KahaLoadTester.java b/activemq-core/src/test/java/org/apache/activemq/broker/store/KahaLoadTester.java
deleted file mode 100755
index b131e18d68..0000000000
--- a/activemq-core/src/test/java/org/apache/activemq/broker/store/KahaLoadTester.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.store;
-
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-
-import javax.jms.BytesMessage;
-import javax.jms.ConnectionFactory;
-import javax.jms.DeliveryMode;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-
-import junit.framework.Test;
-
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.JmsTestSupport;
-import org.apache.activemq.broker.BrokerFactory;
-import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.broker.ProgressPrinter;
-import org.apache.activemq.broker.TransportConnector;
-import org.apache.activemq.command.ActiveMQDestination;
-import org.apache.activemq.command.ActiveMQQueue;
-import org.apache.activemq.xbean.BrokerFactoryBean;
-import org.springframework.core.io.ClassPathResource;
-
-/**
- * 
- * @version $Revision$
- */
-public class KahaLoadTester extends LoadTester  {
-
-    protected BrokerService createBroker() throws Exception {
-        BrokerFactoryBean brokerFactory=new BrokerFactoryBean(new ClassPathResource("org/apache/activemq/broker/store/kahabroker.xml"));
-        brokerFactory.afterPropertiesSet();
-        BrokerService broker =  brokerFactory.getBroker();
-        broker.setDeleteAllMessagesOnStartup(true);
-        return broker;
-    }
-    
-        
-    
-    public static Test suite() {
-        return suite(KahaLoadTester.class);
-    }
-    
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
-    }
-
-}
diff --git a/activemq-core/src/test/java/org/apache/activemq/broker/store/KahaRecoveryBrokerTest.java b/activemq-core/src/test/java/org/apache/activemq/broker/store/KahaRecoveryBrokerTest.java
deleted file mode 100644
index 8362738865..0000000000
--- a/activemq-core/src/test/java/org/apache/activemq/broker/store/KahaRecoveryBrokerTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.store;
-
-import java.io.File;
-import junit.framework.Test;
-
-import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.broker.RecoveryBrokerTest;
-import org.apache.activemq.store.kahadaptor.KahaPersistenceAdapter;
-import org.apache.activemq.xbean.BrokerFactoryBean;
-import org.springframework.core.io.ClassPathResource;
-
-/**
- * Used to verify that recovery works correctly against 
- * 
- * @version $Revision$
- */
-public class KahaRecoveryBrokerTest extends RecoveryBrokerTest {
-   
-    protected BrokerService createBroker() throws Exception {
-        BrokerService broker = createRestartedBroker();
-        broker.setDeleteAllMessagesOnStartup(true);
-        return broker;
-    }
-    
-    protected BrokerService createRestartedBroker() throws Exception {
-        BrokerService broker = new BrokerService();
-        KahaPersistenceAdapter adaptor = new KahaPersistenceAdapter();
-        broker.setPersistenceAdapter(adaptor);
-        broker.addConnector("tcp://localhost:0");
-        return broker;
-    }
-
-    public static Test suite() {
-        return suite(KahaRecoveryBrokerTest.class);
-    }
-
-    
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
-    }
-
-}
diff --git a/activemq-core/src/test/java/org/apache/activemq/broker/store/KahaXARecoveryBrokerTest.java b/activemq-core/src/test/java/org/apache/activemq/broker/store/KahaXARecoveryBrokerTest.java
deleted file mode 100644
index 16fd35eece..0000000000
--- a/activemq-core/src/test/java/org/apache/activemq/broker/store/KahaXARecoveryBrokerTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.store;
-
-import java.io.File;
-import junit.framework.Test;
-
-import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.broker.XARecoveryBrokerTest;
-import org.apache.activemq.store.kahadaptor.KahaPersistenceAdapter;
-import org.apache.activemq.xbean.BrokerFactoryBean;
-import org.springframework.core.io.ClassPathResource;
-
-/**
- * Used to verify that recovery works correctly against 
- * 
- * @version $Revision$
- */
-public class KahaXARecoveryBrokerTest extends XARecoveryBrokerTest {
-
-    public static Test suite() {
-        return suite(KahaXARecoveryBrokerTest.class);
-    }
-    
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
-    }
-
-    protected BrokerService createBroker() throws Exception {
-        BrokerService broker = createRestartedBroker();
-        broker.setDeleteAllMessagesOnStartup(true);
-        return broker;
-    }
-    
-    protected BrokerService createRestartedBroker() throws Exception {
-        BrokerService broker = new BrokerService();
-       
-        KahaPersistenceAdapter adaptor = new KahaPersistenceAdapter();
-        broker.setPersistenceAdapter(adaptor);
-        broker.addConnector("tcp://localhost:0");
-        return broker;
-    }
-    
-}