1 files changed, 4 insertions, 3 deletions

diff --git a/src/transport/test_communicator_basic.c b/src/transport/test_communicator_basic.c
index aa02bda93..e3573ac2c 100644
--- a/src/transport/test_communicator_basic.c
+++ b/src/transport/test_communicator_basic.c
@@ -221,7 +221,7 @@ make_payload (size_t payload_size)
   GNUNET_assert (payload_size >= 8); // So that out timestamp fits
   ts = GNUNET_TIME_absolute_get ();
   ts_n = GNUNET_TIME_absolute_hton (ts);
-  memset (payload, 0, payload_size);
+  memset (payload, 'a', payload_size);
   memcpy (payload, &ts_n, sizeof (struct GNUNET_TIME_AbsoluteNBO));
   return payload;
 }
@@ -367,8 +367,9 @@ add_queue_cb (void *cls,
        "Queue established, starting test...\n");
   start_short = GNUNET_TIME_absolute_get ();
   my_tc = tc_h;
-  if (0 != mtu)
-    long_message_size = mtu - 4; /* Dummy message header overhead */
+  if (0 != mtu) /* Message header overhead */
+    long_message_size = mtu - sizeof(struct GNUNET_TRANSPORT_SendMessageTo)
+                        - sizeof(struct GNUNET_MessageHeader);
   else
     long_message_size = LONG_MESSAGE_SIZE;
   phase = TP_BURST_SHORT;