2 files changed, 8 insertions, 6 deletions
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/client/MessageListenerTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/MessageListenerTest.java
index 4c1d5ee9c1..ffec6c7a29 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/client/MessageListenerTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/client/MessageListenerTest.java
@@ -106,6 +106,14 @@ public class MessageListenerTest extends QpidTestCase implements MessageListener
         }
     }
 
+    public void testSynchronousRecieveNoWait() throws Exception
+    {
+        for (int msg = 0; msg < MSG_COUNT; msg++)
+        {
+            assertTrue(_consumer.receiveNoWait() != null);
+        }
+    }
+
     public void testAsynchronousRecieve() throws Exception
     {
         _consumer.setMessageListener(this);
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/failover/FailoverTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/failover/FailoverTest.java
index cd921f0971..4c4ef0320c 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/failover/FailoverTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/failover/FailoverTest.java
@@ -230,12 +230,6 @@ public class FailoverTest extends FailoverBaseCase implements ConnectionListener
 
         causeFailure(DEFAULT_FAILOVER_TIME);
 
-        if (!CLUSTERED)
-        {
-            msg = consumer.receive(500);
-            assertNull("Should not have received message from new broker!", msg);
-        }
-
         // Check that you produce and consume the rest of messages.
         _logger.debug("==================");
         _logger.debug("Sending " + (totalMessages-toProduce) + " messages");