diff --git a/activemq-kahadb-store/pom.xml b/activemq-kahadb-store/pom.xml
index 49ecdb66c2..6fd9def23c 100755
--- a/activemq-kahadb-store/pom.xml
+++ b/activemq-kahadb-store/pom.xml
@@ -30,11 +30,8 @@
   <name>ActiveMQ :: KahaDB Store</name>
   <description>The ActiveMQ KahaDB Store Implementation</description>
 
-  <properties>
-  </properties>
-
   <dependencies>
-    
+
     <!-- =============================== -->
     <!-- Required Dependencies -->
     <!-- =============================== -->
@@ -42,7 +39,6 @@
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-broker</artifactId>
     </dependency>
-
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>activeio-core</artifactId>
@@ -53,10 +49,6 @@
       <artifactId>activemq-protobuf</artifactId>
       <optional>false</optional>
     </dependency>
-    <dependency>
-      <groupId>org.fusesource.mqtt-client</groupId>
-      <artifactId>mqtt-client</artifactId>
-    </dependency>
 
     <!-- =============================== -->
     <!-- Optional Dependencies           -->
@@ -128,13 +120,6 @@
       <artifactId>commons-net</artifactId>
     </dependency>
 
-    <!-- not really a dependency at all - just added optionally to get the generator working -->
-    <dependency>
-      <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-openwire-generator</artifactId>
-      <optional>true</optional>
-    </dependency>
-
     <!-- =============================== -->
     <!-- Testing Dependencies            -->
     <!-- =============================== -->
diff --git a/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/index/BTreeIndexBenchMark.java b/activemq-kahadb-store/src/test/java/org/apache/activemq/store/kahadb/disk/index/BTreeIndexBenchMark.java
similarity index 100%
rename from activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/index/BTreeIndexBenchMark.java
rename to activemq-kahadb-store/src/test/java/org/apache/activemq/store/kahadb/disk/index/BTreeIndexBenchMark.java
diff --git a/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/index/BTreeIndexTest.java b/activemq-kahadb-store/src/test/java/org/apache/activemq/store/kahadb/disk/index/BTreeIndexTest.java
similarity index 100%
rename from activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/index/BTreeIndexTest.java
rename to activemq-kahadb-store/src/test/java/org/apache/activemq/store/kahadb/disk/index/BTreeIndexTest.java
diff --git a/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/index/HashIndexBenchMark.java b/activemq-kahadb-store/src/test/java/org/apache/activemq/store/kahadb/disk/index/HashIndexBenchMark.java
similarity index 100%
rename from activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/index/HashIndexBenchMark.java
rename to activemq-kahadb-store/src/test/java/org/apache/activemq/store/kahadb/disk/index/HashIndexBenchMark.java
diff --git a/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/index/HashIndexTest.java b/activemq-kahadb-store/src/test/java/org/apache/activemq/store/kahadb/disk/index/HashIndexTest.java
similarity index 100%
rename from activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/index/HashIndexTest.java
rename to activemq-kahadb-store/src/test/java/org/apache/activemq/store/kahadb/disk/index/HashIndexTest.java
diff --git a/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/index/IndexBenchmark.java b/activemq-kahadb-store/src/test/java/org/apache/activemq/store/kahadb/disk/index/IndexBenchmark.java
similarity index 100%
rename from activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/index/IndexBenchmark.java
rename to activemq-kahadb-store/src/test/java/org/apache/activemq/store/kahadb/disk/index/IndexBenchmark.java
diff --git a/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/index/IndexTestSupport.java b/activemq-kahadb-store/src/test/java/org/apache/activemq/store/kahadb/disk/index/IndexTestSupport.java
similarity index 100%
rename from activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/index/IndexTestSupport.java
rename to activemq-kahadb-store/src/test/java/org/apache/activemq/store/kahadb/disk/index/IndexTestSupport.java
diff --git a/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/index/ListIndexTest.java b/activemq-kahadb-store/src/test/java/org/apache/activemq/store/kahadb/disk/index/ListIndexTest.java
similarity index 100%
rename from activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/index/ListIndexTest.java
rename to activemq-kahadb-store/src/test/java/org/apache/activemq/store/kahadb/disk/index/ListIndexTest.java
diff --git a/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/journal/JournalTest.java b/activemq-kahadb-store/src/test/java/org/apache/activemq/store/kahadb/disk/journal/JournalTest.java
similarity index 100%
rename from activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/journal/JournalTest.java
rename to activemq-kahadb-store/src/test/java/org/apache/activemq/store/kahadb/disk/journal/JournalTest.java
diff --git a/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/page/PageFileTest.java b/activemq-kahadb-store/src/test/java/org/apache/activemq/store/kahadb/disk/page/PageFileTest.java
similarity index 100%
rename from activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/page/PageFileTest.java
rename to activemq-kahadb-store/src/test/java/org/apache/activemq/store/kahadb/disk/page/PageFileTest.java
diff --git a/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/util/SequenceSetTest.java b/activemq-kahadb-store/src/test/java/org/apache/activemq/store/kahadb/disk/util/SequenceSetTest.java
similarity index 100%
rename from activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/util/SequenceSetTest.java
rename to activemq-kahadb-store/src/test/java/org/apache/activemq/store/kahadb/disk/util/SequenceSetTest.java
diff --git a/activemq-kahadb-store/src/test/resources/log4j.properties b/activemq-kahadb-store/src/test/resources/log4j.properties
new file mode 100755
index 0000000000..7cc19418fd
--- /dev/null
+++ b/activemq-kahadb-store/src/test/resources/log4j.properties
@@ -0,0 +1,42 @@
+## ---------------------------------------------------------------------------
+## 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.
+## ---------------------------------------------------------------------------
+
+#
+# The logging properties used during tests..
+#
+log4j.rootLogger=INFO, out, stdout
+
+#log4j.logger.org.apache.activemq.broker.scheduler=DEBUG
+#log4j.logger.org.apache.activemq.network.DemandForwardingBridgeSupport=DEBUG
+#log4j.logger.org.apache.activemq.transport.failover=TRACE
+#log4j.logger.org.apache.activemq.store.jdbc=TRACE
+#log4j.logger.org.apache.activemq.broker.region.cursors.AbstractStoreCursor=DEBUG
+#log4j.logger.org.apache.activemq.store.jdbc.JDBCMessageStore=DEBUG
+
+# CONSOLE appender not used by default
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] - %-5p %-30.30c{1} - %m%n
+#log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] - %-5p %-30.30c{1} - %-10.10X{activemq.broker} %-20.20X{activemq.connector} %-10.10X{activemq.destination} - %m%n
+
+# File appender
+log4j.appender.out=org.apache.log4j.FileAppender
+log4j.appender.out.layout=org.apache.log4j.PatternLayout
+log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] - %-5p %-30.30c{1} - %m%n
+#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] - %-5p %-30.30c{1} - %-10.10X{activemq.broker} %-20.20X{activemq.connector} %-10.10X{activemq.destination} - %m%n
+log4j.appender.out.file=target/activemq-test.log
+log4j.appender.out.append=true