1 files changed, 4 insertions, 2 deletions
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/Client.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/Client.java
index 19ef612bcc..2ee29e3da4 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/Client.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/Client.java
@@ -75,7 +75,9 @@ public class Client implements MessageListener
     public synchronized void onMessage(Message response)
     {
 
+
         _logger.info("Received " + (++_count) + " of " + _expected + " responses.");
+
         if (_count == _expected)
         {
 
@@ -89,10 +91,10 @@ public class Client implements MessageListener
 
         if (_count < _expected)
         {
-            wait(10000L);
+            wait(1000L);
         }
 
-        if (_count < _expected)
+        if (_count != _expected)
         {
             throw new Exception("Didn't receive all messages... got " + _count + " expected " + _expected);
         }