diff --git a/src/test/java/nl/nn/testtool/test/junit/util/TestExport.java b/src/test/java/nl/nn/testtool/test/junit/util/TestExport.java
index a08d1844..0a228073 100644
--- a/src/test/java/nl/nn/testtool/test/junit/util/TestExport.java
+++ b/src/test/java/nl/nn/testtool/test/junit/util/TestExport.java
@@ -1,5 +1,5 @@
 /*
-   Copyright 2021, 2023-2024 WeAreFrank!
+   Copyright 2021, 2023-2025 WeAreFrank!
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -127,10 +127,14 @@ public void testExport() throws IllegalAccessException, IllegalArgumentException
 					}
 				} else if (method.getParameters()[0].getType() == String.class) {
 					method.invoke(checkpoint, name);
-				} else if (name.equals("span")) {
-					checkpoint.setSpan(new Span());
 				} else if (name.equals("report")) {
 					// Ignore, this is done hardcoded above (search for "checkpoint.setReport(report)")
+				} else if (name.equals("messageContext")) {
+					Map<String, Object> messageContext = new HashMap<String, Object>();
+					messageContext.put("test", 1000);
+					checkpoint.setMessageContext(messageContext);
+				} else if (name.equals("span")) {
+					checkpoint.setSpan(new Span());
 				} else {
 					assertNull("Method not handled: " + name);
 				}
diff --git a/src/test/resources/nl/nn/testtool/test/junit/util/testExport-expected.xml b/src/test/resources/nl/nn/testtool/test/junit/util/testExport-expected.xml
index 006ef0b1..8dae5287 100644
--- a/src/test/resources/nl/nn/testtool/test/junit/util/testExport-expected.xml
+++ b/src/test/resources/nl/nn/testtool/test/junit/util/testExport-expected.xml
@@ -17,6 +17,14 @@
      <void property="messageClassName">
       <string>messageClassName</string>
      </void>
+     <void property="messageContext">
+      <object class="java.util.HashMap">
+       <void method="put">
+        <string>test</string>
+        <int>1000</int>
+       </void>
+      </object>
+     </void>
      <void property="name">
       <string>name</string>
      </void>