2 files changed, 10 insertions, 2 deletions
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java
index 59ce64eb4f..8c5299e301 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java
@@ -239,7 +239,8 @@ public class BytesMessageTest extends QpidBrokerTestCase implements MessageListe
         {
             if (expected[i] != actual[i])
             {
-                throw new RuntimeException("Failed on byte " + i + " of " + expected.length);
+                throw new RuntimeException("Failed on byte " + i + " of " + expected.length +
+                        "(" + new String(expected) +", " + new String(actual) + ")");
             }
         }
     }
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java
index d97e22e024..e6f3ef7493 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java
@@ -41,11 +41,18 @@ public class LargeMessageTest extends QpidBrokerTestCase
     private static final Logger _logger = LoggerFactory.getLogger(LargeMessageTest.class);
 
     private Destination _destination;
-    private AMQSession _session;
+    private AMQSession<?, ?> _session;
     private AMQConnection _connection;
     
     protected void setUp() throws Exception
     {
+        // Smaller packet size for UDP
+        if (Boolean.getBoolean("profile.udp"))
+        {
+            setConfigurationProperty("advanced.framesize", "20000");
+            setBrokerEnvironment("qpid.maxFrameSize", "20000");
+        }
+    
         super.setUp();
         try
         {