diff --git a/activemq-core/src/test/java/org/apache/activemq/transport/vm/VMTransportThreadSafeTest.java b/activemq-core/src/test/java/org/apache/activemq/transport/vm/VMTransportThreadSafeTest.java
index aa09958bd9..2dd34282f9 100644
--- a/activemq-core/src/test/java/org/apache/activemq/transport/vm/VMTransportThreadSafeTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/transport/vm/VMTransportThreadSafeTest.java
@@ -487,7 +487,7 @@ public class VMTransportThreadSafeTest {
             @Override
             public void run() {
                 try {
-                    Thread.sleep(500);
+                    Thread.sleep(1000);
                     remote.stop();
                 } catch (Exception e) {
                 }
@@ -498,7 +498,7 @@ public class VMTransportThreadSafeTest {
 
         t.start();
 
-        assertTrue(Wait.waitFor(new Wait.Condition() {
+        assertTrue("Remote should receive: " + expect + ", commands but got: " + remoteReceived.size(), Wait.waitFor(new Wait.Condition() {
             @Override
             public boolean isSatisified() throws Exception {
                 return remoteReceived.size() >= expect;