diff --git a/e2e/parse/messagePart_test.go b/e2e/parse/messagePart_test.go
index a25ddb4743a5d834605c2a559cc98dc7621461eb..b39699badf1a1097781e3f882730c55ca34dcc5b 100644
--- a/e2e/parse/messagePart_test.go
+++ b/e2e/parse/messagePart_test.go
@@ -27,7 +27,7 @@ var expectedMP = messagePart{
 // Tests that a new function part is successfully created.
 func Test_newMessagePart(t *testing.T) {
 	testStr := []byte{'t', 'e', 's', 't', 'i', 'n', 'g'}
-	goTmp := newMessagePart(32, 6, testStr, len(testStr))
+	goTmp := newMessagePart(32, 6, testStr, len(testStr)+8)
 	if !reflect.DeepEqual(goTmp, expectedMP) {
 		t.Errorf("MessagePart received and MessagePart expected do not match."+
 			"\nexpected: %#v\nreceived: %#v", expectedMP, goTmp)
diff --git a/e2e/parse/partition_test.go b/e2e/parse/partition_test.go
index db05ccfbf0f04f382c60004357fd2208e2793d62..2d1e7828e01f966e55d266cac2bdcd2788995a2c 100644
--- a/e2e/parse/partition_test.go
+++ b/e2e/parse/partition_test.go
@@ -70,7 +70,7 @@ func TestPartitioner_Partition(t *testing.T) {
 // Test that Partitioner.HandlePartition can handle a message part.
 func TestPartitioner_HandlePartition(t *testing.T) {
 	p := NewPartitioner(versioned.NewKV(ekv.MakeMemstore()), 256)
-	m := newMessagePart(1107, 1, []byte(ipsumTestStr), 256)
+	m := newMessagePart(1107, 1, []byte(ipsumTestStr), len(ipsumTestStr)+32)
 
 	_, _ = p.HandlePartition(
 		&id.DummyUser,
@@ -83,7 +83,8 @@ func TestPartitioner_HandlePartition(t *testing.T) {
 func TestPartitioner_HandleFirstPartition(t *testing.T) {
 	p := NewPartitioner(versioned.NewKV(ekv.MakeMemstore()), 256)
 	m := newFirstMessagePart(
-		catalog.XxMessage, 1107, 1, netTime.Now(), []byte(ipsumTestStr), 256)
+		catalog.XxMessage, 1107, 1, netTime.Now(), []byte(ipsumTestStr),
+		len(ipsumTestStr)+32)
 
 	_, _ = p.HandlePartition(
 		&id.DummyUser,