1 files changed, 10 insertions, 2 deletions
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
index fe7e79426d..7428dbedc2 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
@@ -460,8 +460,16 @@ public class CommitRollbackTest extends QpidTestCase
         }
 
         result = _consumer.receive(1000);
-        assertNotNull("test message was consumed and rolled back, but is gone", result);
-        assertTrue("Messasge is not marked as redelivered" + result, result.getJMSRedelivered());
+
+        if( isBroker08() )
+        {
+             assertNotNull("test message was consumed and rolled back, but is gone", result);
+             assertTrue("Messasge is not marked as redelivered" + result, result.getJMSRedelivered());
+        }
+        else
+        {
+            assertNull("test message was consumed and not rolled back, but is redelivered", result);                
+        }
 
         result = _consumer.receive(1000);
         assertNull("test message should be null:" + result, result);