diff --git a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/enricher/XPathHeaderEnricher.java b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/enricher/XPathHeaderEnricher.java
index ea411bc697..2c436852fb 100644
--- a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/enricher/XPathHeaderEnricher.java
+++ b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/enricher/XPathHeaderEnricher.java
@@ -16,6 +16,10 @@
 
 package org.springframework.integration.xml.enricher;
 
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+
 import org.springframework.integration.core.Message;
 import org.springframework.integration.message.MessageBuilder;
 import org.springframework.integration.transformer.Transformer;
@@ -26,10 +30,6 @@ import org.springframework.util.StringUtils;
 import org.springframework.xml.xpath.XPathExpression;
 import org.w3c.dom.Node;
 
-import java.util.Collections;
-import java.util.Map;
-import java.util.Set;
-
 
 /**
  * Transformer implementation which evaluates XPath expressions against the message payload and inserts the
@@ -77,7 +77,7 @@ public class XPathHeaderEnricher implements Transformer {
     }
 
     public Message<?> transform(Message<?> message) {
-        MessageBuilder builder = MessageBuilder.fromMessage(message);
+        MessageBuilder<?> builder = MessageBuilder.fromMessage(message);
         Node node = this.converter.convertToNode(message.getPayload());
 
         Set<String> keys = this.expressionMap.keySet();
@@ -94,7 +94,7 @@ public class XPathHeaderEnricher implements Transformer {
         return builder.build();
     }
 
-    protected void setHeader(Node node, String headerName, XPathExpression expression, XPathEvaluationType evaluationType, MessageBuilder builder) {
+    protected void setHeader(Node node, String headerName, XPathExpression expression, XPathEvaluationType evaluationType, MessageBuilder<?> builder) {
         Object result = evaluationType.evaluateXPath(expression, node);
 
         boolean  nullOrEmptyString = (result == null ||
diff --git a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/TestTemplatesFactory.java b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/TestTemplatesFactory.java
index 2764a50e25..cf517f945c 100644
--- a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/TestTemplatesFactory.java
+++ b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/TestTemplatesFactory.java
@@ -26,9 +26,9 @@ import org.springframework.core.io.ClassPathResource;
 /**
  * @author Jonas Partner
  */
-public class TestTemplatesFactory implements FactoryBean {
+public class TestTemplatesFactory implements FactoryBean<Templates> {
 
-	public Object getObject() throws Exception {
+	public Templates getObject() throws Exception {
 		org.springframework.core.io.Resource xslResource = new ClassPathResource("test.xsl", getClass());
 		return TransformerFactory.newInstance().newTemplates(new StreamSource(xslResource.getInputStream()));
 	}
diff --git a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XPathMessageSplitterParserTests.java b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XPathMessageSplitterParserTests.java
index 8c6b0012a6..119941aa3b 100644
--- a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XPathMessageSplitterParserTests.java
+++ b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XPathMessageSplitterParserTests.java
@@ -87,7 +87,6 @@ public class XPathMessageSplitterParserTests {
 
 	@Test
 	public void testProvideDocumentBuilder() throws Exception {
-		Document doc = XmlTestUtil.getDocumentForString("<names><name>Bob</name><name>John</name></names>");
 		TestXmlApplicationContext ctx = TestXmlApplicationContextHelper
 				.getTestAppContext("<bean id='docBuilderFactory' class='org.springframework.integration.xml.config.StubDocumentBuilderFactory' />"
 						+ channelDefinitions
@@ -102,7 +101,6 @@ public class XPathMessageSplitterParserTests {
 	
 	@Test
 	public void testXPathExpressionRef() throws Exception {
-		Document doc = XmlTestUtil.getDocumentForString("<names><name>Bob</name><name>John</name></names>");
 		TestXmlApplicationContext ctx = TestXmlApplicationContextHelper
 				.getTestAppContext(
 						 channelDefinitions +
diff --git a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/enricher/XPathHeaderEnricherTests.java b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/enricher/XPathHeaderEnricherTests.java
index 4f5614ca9e..87a5706f53 100644
--- a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/enricher/XPathHeaderEnricherTests.java
+++ b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/enricher/XPathHeaderEnricherTests.java
@@ -16,9 +16,12 @@
 
 package org.springframework.integration.xml.enricher;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import java.util.HashMap;
+import java.util.Map;
 
-import org.junit.Before;
 import org.junit.Test;
 import org.springframework.integration.core.Message;
 import org.springframework.integration.core.MessageHeaders;
@@ -27,9 +30,6 @@ import org.springframework.integration.xml.xpath.XPathEvaluationType;
 import org.springframework.xml.xpath.XPathExpression;
 import org.springframework.xml.xpath.XPathExpressionFactory;
 
-import java.util.HashMap;
-import java.util.Map;
-
 
 public class XPathHeaderEnricherTests {
 
@@ -43,7 +43,7 @@ public class XPathHeaderEnricherTests {
         String docAsString = "<root><elementOne>1</elementOne><elementTwo>2</elementTwo></root>";
 
         XPathHeaderEnricher enricher = new XPathHeaderEnricher(expressionMap);
-        Message result = enricher.transform(MessageBuilder.withPayload(docAsString).build());
+        Message<?> result = enricher.transform(MessageBuilder.withPayload(docAsString).build());
 
         MessageHeaders headers = result.getHeaders();
 
@@ -58,7 +58,7 @@ public class XPathHeaderEnricherTests {
         String docAsString = "<root><elementOne>1</elementOne></root>";
 
         XPathHeaderEnricher enricher = new XPathHeaderEnricher(expressionMap);
-        Message result = enricher.transform(MessageBuilder.withPayload(docAsString).build());
+        Message<?> result = enricher.transform(MessageBuilder.withPayload(docAsString).build());
 
         MessageHeaders headers = result.getHeaders();
         assertNull("value set for two when result was null",headers.get("two"));
@@ -72,7 +72,7 @@ public class XPathHeaderEnricherTests {
 
         XPathHeaderEnricher enricher = new XPathHeaderEnricher(expressionMap);
         enricher.setSkipSettingNullResults(false);
-        Message result = enricher.transform(MessageBuilder.withPayload(docAsString).build());
+        Message<?> result = enricher.transform(MessageBuilder.withPayload(docAsString).build());
 
         MessageHeaders headers = result.getHeaders();
         assertEquals("no value set for two when result was null and skip null was false","" ,headers.get("two"));
@@ -90,7 +90,7 @@ public class XPathHeaderEnricherTests {
 
         XPathHeaderEnricher enricher = new XPathHeaderEnricher(expressionMap);
         enricher.setEvaluationTypes(evalTypeMap);
-        Message result = enricher.transform(MessageBuilder.withPayload(docAsString).build());
+        Message<?> result = enricher.transform(MessageBuilder.withPayload(docAsString).build());
 
         MessageHeaders headers = result.getHeaders();