diff --git a/activemq-core/src/test/java/org/apache/activemq/leveldb/LevelDBStoreBrokerTest.java b/activemq-core/src/test/java/org/apache/activemq/leveldb/LevelDBStoreBrokerTest.java
index 39661100fc..33a8839151 100644
--- a/activemq-core/src/test/java/org/apache/activemq/leveldb/LevelDBStoreBrokerTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/leveldb/LevelDBStoreBrokerTest.java
@@ -1,5 +1,6 @@
 package org.apache.activemq.leveldb;
 
+import junit.framework.Test;
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.broker.BrokerTest;
 import org.apache.activemq.store.PersistenceAdapter;
@@ -12,13 +13,13 @@ import java.io.IOException;
  */
 public class LevelDBStoreBrokerTest extends BrokerTest {
 
-//    def suite: Test = {
-//      return new TestSuite(classOf[LevelDBStoreBrokerTest])
-//    }
-//
-//    def main(args: Array[String]): Unit = {
-//      junit.textui.TestRunner.run(suite)
-//    }
+    public static Test suite() {
+        return suite(LevelDBStoreBrokerTest.class);
+    }
+
+    public static void main(String[] args) {
+        junit.textui.TestRunner.run(suite());
+    }
 
     @Override
     protected BrokerService createBroker() throws Exception {
diff --git a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala
index 08c8fc73a3..25230c5c0d 100644
--- a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala
+++ b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala
@@ -311,6 +311,7 @@ class LevelDBStore extends ServiceSupport with BrokerServiceAware with Persisten
           if( prepared ) {
             uow.dequeue(xacontainer_id, message.getMessageId)
           }
+          message.setMessageId(message.getMessageId.copy())
           store.doAdd(uow, message, delay)
         }