diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailHeaderEnricherTests.java b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailHeaderEnricherTests.java
index 0681b9e9a6..e3453261d4 100644
--- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailHeaderEnricherTests.java
+++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailHeaderEnricherTests.java
@@ -26,9 +26,9 @@ import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.integration.Message;
+import org.springframework.integration.core.GenericMessage;
 import org.springframework.integration.core.MessageChannel;
 import org.springframework.integration.core.MessagingTemplate;
-import org.springframework.integration.core.StringMessage;
 import org.springframework.integration.mail.MailHeaders;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -49,7 +49,7 @@ public class MailHeaderEnricherTests {
 	@Test
 	public void literalValues() {
 		MessagingTemplate template = new MessagingTemplate(literalValuesInput);
-		Message<?> result = template.sendAndReceive(new StringMessage("test"));
+		Message<?> result = template.sendAndReceive(new GenericMessage<String>("test"));
 		Map<String, Object> headers = result.getHeaders();
 		assertEquals("test.to", headers.get(MailHeaders.TO));
 		assertEquals("test.cc", headers.get(MailHeaders.CC));
@@ -62,7 +62,7 @@ public class MailHeaderEnricherTests {
 	@Test
 	public void expressions() {
 		MessagingTemplate template = new MessagingTemplate(expressionsInput);
-		Message<?> result = template.sendAndReceive(new StringMessage("foo"));
+		Message<?> result = template.sendAndReceive(new GenericMessage<String>("foo"));
 		Map<String, Object> headers = result.getHeaders();
 		assertEquals("foo.to", headers.get(MailHeaders.TO));
 		assertEquals("foo.cc", headers.get(MailHeaders.CC));