diff --git a/activemq-core/src/test/java/org/apache/activemq/broker/QueueMbeanRestartTest.java b/activemq-core/src/test/java/org/apache/activemq/broker/QueueMbeanRestartTest.java
index bd51d3e338..4ec7016375 100644
--- a/activemq-core/src/test/java/org/apache/activemq/broker/QueueMbeanRestartTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/broker/QueueMbeanRestartTest.java
@@ -49,7 +49,7 @@ public class QueueMbeanRestartTest extends TestSupport {
 
     public void initCombosForTestMBeanPresenceOnRestart() {
         addCombinationValues("defaultPersistenceAdapter",
-                new Object[]{PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.JDBC});
+                new Object[]{PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.LevelDB, PersistenceAdapterChoice.JDBC});
     }
 
     public void testMBeanPresenceOnRestart() throws Exception {
diff --git a/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2584Test.java b/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2584Test.java
index 28135fc5f8..c9ceb56e18 100644
--- a/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2584Test.java
+++ b/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2584Test.java
@@ -57,7 +57,7 @@ public class AMQ2584Test extends org.apache.activemq.TestSupport {
     public void initCombosForTestSize() throws Exception {
         this.addCombinationValues("defaultPersistenceAdapter",
                 new Object[]{
-                        PersistenceAdapterChoice.AMQ,
+                        PersistenceAdapterChoice.LevelDB,
                         PersistenceAdapterChoice.KahaDB
                 });
     }
diff --git a/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2870Test.java b/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2870Test.java
index 6355040f39..8f515a7fa2 100644
--- a/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2870Test.java
+++ b/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2870Test.java
@@ -53,7 +53,7 @@ public class AMQ2870Test extends org.apache.activemq.TestSupport {
     
     public void initCombosForTestSize() throws Exception {
         this.addCombinationValues("defaultPersistenceAdapter",
-                new Object[]{ PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.AMQ});
+                new Object[]{ PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.LevelDB});
     }
     
     public void testSize() throws Exception {
diff --git a/activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java b/activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java
index 8f2994b73f..c99b05e159 100644
--- a/activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java
@@ -144,7 +144,7 @@ public class FailoverTransactionTest extends TestSupport {
 
     public void initCombosForTestFailoverCommitReplyLost() {
         addCombinationValues("defaultPersistenceAdapter",
-                new Object[]{PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.AMQ, PersistenceAdapterChoice.JDBC});
+                new Object[]{PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.LevelDB, PersistenceAdapterChoice.JDBC});
     }
 
     @SuppressWarnings("unchecked")
@@ -352,7 +352,7 @@ public class FailoverTransactionTest extends TestSupport {
 
     public void initCombosForTestFailoverSendReplyLost() {
         addCombinationValues("defaultPersistenceAdapter",
-            new Object[]{PersistenceAdapterChoice.KahaDB,
+            new Object[]{PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.LevelDB,
                     PersistenceAdapterChoice.JDBC
                     // not implemented for AMQ store
             });
@@ -461,7 +461,7 @@ public class FailoverTransactionTest extends TestSupport {
 
     public void initCombosForTestFailoverConnectionSendReplyLost() {
         addCombinationValues("defaultPersistenceAdapter",
-            new Object[]{PersistenceAdapterChoice.KahaDB,
+            new Object[]{PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.LevelDB,
                     PersistenceAdapterChoice.JDBC
                     // last producer message id store feature not implemented for AMQ store
             });
diff --git a/activemq-core/src/test/java/org/apache/activemq/usecases/ConcurrentProducerDurableConsumerTest.java b/activemq-core/src/test/java/org/apache/activemq/usecases/ConcurrentProducerDurableConsumerTest.java
index 1603ad2515..15d9bd55d3 100644
--- a/activemq-core/src/test/java/org/apache/activemq/usecases/ConcurrentProducerDurableConsumerTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/usecases/ConcurrentProducerDurableConsumerTest.java
@@ -68,7 +68,7 @@ public class ConcurrentProducerDurableConsumerTest extends TestSupport {
 
     public void initCombosForTestSendRateWithActivatingConsumers() throws Exception {
         addCombinationValues("defaultPersistenceAdapter",
-                new Object[]{PersistenceAdapterChoice.KahaDB, /* too slow for hudson - PersistenceAdapterChoice.JDBC,*/  PersistenceAdapterChoice.MEM});
+                new Object[]{PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.LevelDB,  PersistenceAdapterChoice.MEM});
     }
 
     public void testSendRateWithActivatingConsumers() throws Exception {
@@ -153,7 +153,7 @@ public class ConcurrentProducerDurableConsumerTest extends TestSupport {
 
     public void x_initCombosForTestSendWithInactiveAndActiveConsumers() throws Exception {
         addCombinationValues("defaultPersistenceAdapter",
-                new Object[]{PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.JDBC});
+                new Object[]{PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.LevelDB, PersistenceAdapterChoice.JDBC});
     }
 
     public void x_testSendWithInactiveAndActiveConsumers() throws Exception {
diff --git a/activemq-core/src/test/java/org/apache/activemq/usecases/ConcurrentProducerQueueConsumerTest.java b/activemq-core/src/test/java/org/apache/activemq/usecases/ConcurrentProducerQueueConsumerTest.java
index a30e284178..e9e3b54dea 100644
--- a/activemq-core/src/test/java/org/apache/activemq/usecases/ConcurrentProducerQueueConsumerTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/usecases/ConcurrentProducerQueueConsumerTest.java
@@ -74,7 +74,7 @@ public class ConcurrentProducerQueueConsumerTest extends TestSupport
 
     public void initCombosForTestSendRateWithActivatingConsumers() throws Exception {
         addCombinationValues("defaultPersistenceAdapter",
-                new Object[]{PersistenceAdapterChoice.KahaDB,
+                new Object[]{PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.LevelDB,
                              /* too slow for hudson - PersistenceAdapterChoice.JDBC,*/
                              PersistenceAdapterChoice.MEM});
     }
@@ -164,7 +164,7 @@ public class ConcurrentProducerQueueConsumerTest extends TestSupport
 
     public void x_initCombosForTestSendWithInactiveAndActiveConsumers() throws Exception {
         addCombinationValues("defaultPersistenceAdapter",
-                new Object[]{PersistenceAdapterChoice.KahaDB,
+                new Object[]{PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.LevelDB,
                              /* too slow for hudson - PersistenceAdapterChoice.JDBC,*/
                              PersistenceAdapterChoice.MEM});
     }
diff --git a/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOfflineTest.java b/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOfflineTest.java
index a7b7c4a123..4bc7ad3b18 100644
--- a/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOfflineTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOfflineTest.java
@@ -132,7 +132,7 @@ public class DurableSubscriptionOfflineTest extends org.apache.activemq.TestSupp
 
     public void initCombosForTestConsumeOnlyMatchedMessages() throws Exception {
         this.addCombinationValues("defaultPersistenceAdapter",
-                new Object[]{ PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.JDBC});
+                new Object[]{ PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.LevelDB, PersistenceAdapterChoice.JDBC});
         this.addCombinationValues("usePrioritySupport",
                 new Object[]{ Boolean.TRUE, Boolean.FALSE});
     }
@@ -223,7 +223,7 @@ public class DurableSubscriptionOfflineTest extends org.apache.activemq.TestSupp
     
     public void initCombosForTestVerifyAllConsumedAreAcked() throws Exception {
         this.addCombinationValues("defaultPersistenceAdapter",
-               new Object[]{ PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.JDBC});
+               new Object[]{ PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.LevelDB, PersistenceAdapterChoice.JDBC});
         this.addCombinationValues("usePrioritySupport",
                 new Object[]{ Boolean.TRUE, Boolean.FALSE});
     }
@@ -453,7 +453,7 @@ public class DurableSubscriptionOfflineTest extends org.apache.activemq.TestSupp
 
     public void initCombosForTestOfflineSubscriptionCanConsumeAfterOnlineSubs() throws Exception {
         this.addCombinationValues("defaultPersistenceAdapter",
-                new Object[]{ PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.JDBC});
+                new Object[]{ PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.LevelDB, PersistenceAdapterChoice.JDBC});
         this.addCombinationValues("usePrioritySupport",
                 new Object[]{ Boolean.TRUE, Boolean.FALSE});
     }
@@ -532,7 +532,7 @@ public class DurableSubscriptionOfflineTest extends org.apache.activemq.TestSupp
 
     public void initCombosForTestInterleavedOfflineSubscriptionCanConsume() throws Exception {
         this.addCombinationValues("defaultPersistenceAdapter",
-                new Object[]{PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.JDBC});
+                new Object[]{PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.LevelDB, PersistenceAdapterChoice.JDBC});
     }
 
     public void testInterleavedOfflineSubscriptionCanConsume() throws Exception {
@@ -608,7 +608,7 @@ public class DurableSubscriptionOfflineTest extends org.apache.activemq.TestSupp
 
     public void initCombosForTestMixOfOnLineAndOfflineSubsGetAllMatched() throws Exception {
         this.addCombinationValues("defaultPersistenceAdapter",
-                new Object[]{ PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.JDBC});
+                new Object[]{ PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.LevelDB, PersistenceAdapterChoice.JDBC});
     }
 
     private static String filter = "$a='A1' AND (($b=true AND $c=true) OR ($d='D1' OR $d='D2'))";
@@ -809,7 +809,7 @@ public class DurableSubscriptionOfflineTest extends org.apache.activemq.TestSupp
 
     public void initCombosForTestOfflineSubscriptionWithSelectorAfterRestart() throws Exception {
         this.addCombinationValues("defaultPersistenceAdapter",
-                new Object[]{ PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.JDBC});
+                new Object[]{ PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.LevelDB, PersistenceAdapterChoice.JDBC});
     }
     
     public void testOfflineSubscriptionWithSelectorAfterRestart() throws Exception {
@@ -899,7 +899,7 @@ public class DurableSubscriptionOfflineTest extends org.apache.activemq.TestSupp
 
     public void initCombosForTestOfflineAfterRestart() throws Exception {
         this.addCombinationValues("defaultPersistenceAdapter",
-                new Object[]{ PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.JDBC});
+                new Object[]{ PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.LevelDB, PersistenceAdapterChoice.JDBC});
     }
 
     public void testOfflineSubscriptionAfterRestart() throws Exception {