diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AnnotationAggregatorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AnnotationAggregatorTests.java
index 325f6166b8..6a68adb004 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AnnotationAggregatorTests.java
+++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AnnotationAggregatorTests.java
@@ -55,8 +55,8 @@ public class AnnotationAggregatorTests {
 		@SuppressWarnings("unchecked")
 		Message<String> result = (Message<String>) output.receive();
 		String payload = result.getPayload();
-		assertTrue("Wrong payload: "+payload, payload.matches(".*Payload.*?=a.*"));
-		assertTrue("Wrong payload: "+payload, payload.matches(".*Payload.*?=b.*"));
+		assertTrue("Wrong payload: "+payload, payload.matches(".*payload.*?=a.*"));
+		assertTrue("Wrong payload: "+payload, payload.matches(".*payload.*?=b.*"));
 	}
 
 	@SuppressWarnings("unused")
diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/MarshallingTransformerParserTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/MarshallingTransformerParserTests.java
index d07c5888fd..bf05049f03 100644
--- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/MarshallingTransformerParserTests.java
+++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/MarshallingTransformerParserTests.java
@@ -29,11 +29,11 @@ import org.w3c.dom.Document;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.messaging.support.GenericMessage;
 import org.springframework.integration.xml.config.StubResultFactory.StubStringResult;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.PollableChannel;
+import org.springframework.messaging.support.GenericMessage;
 import org.springframework.xml.transform.StringResult;
 
 /**
@@ -114,9 +114,9 @@ public class MarshallingTransformerParserTests  {
 		assertTrue("Wrong payload type", result.getPayload() instanceof DOMResult);
 		Document doc = (Document) ((DOMResult) result.getPayload()).getNode();
 		String actual = doc.getDocumentElement().getTextContent();
-		assertThat(actual, Matchers.containsString("[Payload"));
-		assertThat(actual, Matchers.containsString("=hello]"));
-		assertThat(actual, Matchers.containsString("[Headers="));
+		assertThat(actual, Matchers.containsString("[payload"));
+		assertThat(actual, Matchers.containsString("=hello,"));
+		assertThat(actual, Matchers.containsString(", headers="));
 	}
 
 }