diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6463Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6463Test.java
index d63e57b7e4..d3996bf1e7 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6463Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6463Test.java
@@ -73,12 +73,12 @@ public class AMQ6463Test extends JmsTestSupport {
         producer.close();
 
         // lets not consume till producer is blocked
-        Wait.waitFor(new Wait.Condition() {
+        assertTrue("got blocked event", Wait.waitFor(new Wait.Condition() {
             @Override
             public boolean isSatisified() throws Exception {
                 return gotUsageBlocked.get();
             }
-        });
+        }));
 
         MessageConsumer consumer = session.createConsumer(queueA);
         TextMessage msg;
@@ -97,6 +97,7 @@ public class AMQ6463Test extends JmsTestSupport {
         service.setPersistent(true);
         service.setUseJmx(false);
         service.setSchedulerSupport(true);
+        service.setDeleteAllMessagesOnStartup(true);
 
         // Setup a destination policy where it takes only 1 message at a time.
         PolicyMap policyMap = new PolicyMap();