diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5035Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5035Test.java
index a253bc8864..13ddd30c4f 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5035Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5035Test.java
@@ -48,6 +48,7 @@ public class AMQ5035Test {
     public void setUp() throws Exception {
         brokerService = BrokerFactory.createBroker(xbean + confBase + "/activemq.xml");
         connectionUri = brokerService.getTransportConnectorByScheme("tcp").getPublishableConnectString();
+        brokerService.setDeleteAllMessagesOnStartup(true);
         brokerService.start();
         brokerService.waitUntilStarted();
     }
diff --git a/activemq-unit-tests/src/test/resources/org/apache/activemq/bugs/amq5035/activemq.xml b/activemq-unit-tests/src/test/resources/org/apache/activemq/bugs/amq5035/activemq.xml
index 1bd5a4296d..28acca47c7 100644
--- a/activemq-unit-tests/src/test/resources/org/apache/activemq/bugs/amq5035/activemq.xml
+++ b/activemq-unit-tests/src/test/resources/org/apache/activemq/bugs/amq5035/activemq.xml
@@ -64,7 +64,7 @@
             http://activemq.apache.org/persistence.html
         -->
         <persistenceAdapter>
-            <kahaDB directory="${activemq.data}/kahadb"/>
+            <kahaDB directory="target/activemq-data/KahaDB"/>
         </persistenceAdapter>