diff --git a/pom.xml b/pom.xml
index b3674f5eb..20142d250 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,7 +119,7 @@
 		<wss4j.version>2.2.0</wss4j.version>
 		<xmlsec.version>2.1.0</xmlsec.version>
 		<xml-schema-core.version>2.2.2</xml-schema-core.version>
-		<xmlunit.version>1.5</xmlunit.version>
+		<xmlunit.version>2.6.2</xmlunit.version>
 		<xws-security.version>3.0</xws-security.version>
 		<xom.version>1.2.5</xom.version>
 	</properties>
@@ -169,11 +169,23 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>xmlunit</groupId>
-			<artifactId>xmlunit</artifactId>
+			<groupId>org.xmlunit</groupId>
+			<artifactId>xmlunit-core</artifactId>
 			<version>${xmlunit.version}</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.xmlunit</groupId>
+			<artifactId>xmlunit-assertj</artifactId>
+			<version>${xmlunit.version}</version>
+			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+          			<groupId>org.assertj</groupId>
+          			<artifactId>assertj-core</artifactId>
+        		</exclusion>
+        	</exclusions>
+		</dependency>
 		<dependency>
 			<groupId>org.assertj</groupId>
 			<artifactId>assertj-core</artifactId>
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageTestCase.java
index 593db134a..ede7fb16a 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageTestCase.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageTestCase.java
@@ -47,7 +47,6 @@
 import org.springframework.xml.sax.SaxUtils;
 import org.springframework.xml.transform.StringResult;
 
-import org.custommonkey.xmlunit.XMLUnit;
 import org.junit.Before;
 import org.junit.Test;
 import org.w3c.dom.Document;
@@ -56,7 +55,7 @@
 import org.xml.sax.helpers.DefaultHandler;
 import org.xml.sax.helpers.XMLReaderFactory;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.xmlunit.assertj.XmlAssert.assertThat;
 
 public abstract class AbstractWebServiceMessageTestCase {
 
@@ -78,7 +77,6 @@ public final void setUp() throws Exception {
 		transformer = transformerFactory.newTransformer();
 		webServiceMessage = createWebServiceMessage();
 		payload = new ClassPathResource("payload.xml", AbstractWebServiceMessageTestCase.class);
-		XMLUnit.setIgnoreWhitespace(true);
 	}
 
 	@Test
@@ -92,7 +90,7 @@ public void testDomPayload() throws Exception {
 		Document resultDocument = documentBuilder.newDocument();
 		DOMResult domResult = new DOMResult(resultDocument);
 		transformer.transform(webServiceMessage.getPayloadSource(), domResult);
-		assertXMLEqual(payloadDocument, resultDocument);
+		assertThat(resultDocument).and(payloadDocument).areSimilar();
 		validateMessage();
 	}
 
@@ -108,7 +106,7 @@ public void testEventReaderPayload() throws Exception {
 		Result staxResult = StaxUtils.createCustomStaxResult(eventWriter);
 		transformer.transform(webServiceMessage.getPayloadSource(), staxResult);
 		eventWriter.flush();
-		assertXMLEqual(getExpectedString(), stringWriter.toString());
+		assertThat(stringWriter.toString()).and(getExpectedString()).areSimilar();
 		validateMessage();
 	}
 
@@ -120,7 +118,7 @@ public void testReaderPayload() throws Exception {
 		StringWriter resultWriter = new StringWriter();
 		StreamResult streamResult = new StreamResult(resultWriter);
 		transformer.transform(webServiceMessage.getPayloadSource(), streamResult);
-		assertXMLEqual(getExpectedString(), resultWriter.toString());
+		assertThat(resultWriter.toString()).and(getExpectedString()).areSimilar();
 	}
 
 	@Test
@@ -129,7 +127,7 @@ public void testSaxPayload() throws Exception {
 		transformer.transform(saxSource, webServiceMessage.getPayloadResult());
 		StringResult stringResult = new StringResult();
 		transformer.transform(webServiceMessage.getPayloadSource(), stringResult);
-		assertXMLEqual(getExpectedString(), stringResult.toString());
+		assertThat(stringResult.toString()).and(getExpectedString()).areSimilar();
 		validateMessage();
 	}
 
@@ -142,7 +140,7 @@ public void testStreamPayload() throws Exception {
 		transformer.transform(webServiceMessage.getPayloadSource(), streamResult);
 		ByteArrayOutputStream expectedStream = new ByteArrayOutputStream();
 		FileCopyUtils.copy(payload.getInputStream(), expectedStream);
-		assertXMLEqual(expectedStream.toString("UTF-8"), resultStream.toString("UTF-8"));
+		assertThat(resultStream.toString("UTF-8")).and(expectedStream.toString("UTF-8")).areSimilar();
 		validateMessage();
 	}
 
@@ -158,7 +156,7 @@ public void testStreamReaderPayload() throws Exception {
 		Result staxResult = StaxUtils.createCustomStaxResult(streamWriter);
 		transformer.transform(webServiceMessage.getPayloadSource(), staxResult);
 		streamWriter.flush();
-		assertXMLEqual(getExpectedString(), stringWriter.toString());
+		assertThat(stringWriter.toString()).and(getExpectedString()).areSimilar();
 		validateMessage();
 	}
 
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap11WebServiceTemplateIntegrationTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap11WebServiceTemplateIntegrationTestCase.java
index 3296439e4..b91d4287d 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap11WebServiceTemplateIntegrationTestCase.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap11WebServiceTemplateIntegrationTestCase.java
@@ -41,7 +41,7 @@
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactory;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.xmlunit.assertj.XmlAssert.assertThat;
 import org.junit.AfterClass;
 import org.junit.Assert;
 import static org.junit.Assert.assertEquals;
@@ -118,7 +118,7 @@ public void sendSourceAndReceiveToResult() throws SAXException, IOException {
 		boolean b = template.sendSourceAndReceiveToResult(baseUrl + "/soap/echo",
 				new StringSource(messagePayload), result);
 		Assert.assertTrue("Invalid result", b);
-		assertXMLEqual(messagePayload, result.toString());
+		assertThat(result.toString()).and(messagePayload).areSimilar();
 	}
 
 	@Test
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap12WebServiceTemplateIntegrationTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap12WebServiceTemplateIntegrationTestCase.java
index 1a30aed40..de381c9cd 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap12WebServiceTemplateIntegrationTestCase.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap12WebServiceTemplateIntegrationTestCase.java
@@ -43,7 +43,7 @@
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactory;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.xmlunit.assertj.XmlAssert.assertThat;
 import org.junit.AfterClass;
 import org.junit.Assert;
 import static org.junit.Assert.assertEquals;
@@ -129,7 +129,7 @@ public void sendSourceAndReceiveToResult() throws SAXException, IOException {
 		boolean b = template.sendSourceAndReceiveToResult(baseUrl + "/soap/echo",
 				new StringSource(messagePayload), result);
 		Assert.assertTrue("Invalid result", b);
-		assertXMLEqual(messagePayload, result.toString());
+		assertThat(result.toString()).and(messagePayload).areSimilar();
 	}
 
 	@Test
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/client/core/DomPoxWebServiceTemplateIntegrationTest.java b/spring-ws-core/src/test/java/org/springframework/ws/client/core/DomPoxWebServiceTemplateIntegrationTest.java
index 046f72d7d..5ca6ca54b 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/client/core/DomPoxWebServiceTemplateIntegrationTest.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/client/core/DomPoxWebServiceTemplateIntegrationTest.java
@@ -29,7 +29,7 @@
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.xmlunit.assertj.XmlAssert.assertThat;
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
@@ -79,7 +79,7 @@ public void domPox() throws Exception {
 		StringResult result = new StringResult();
 		template.sendSourceAndReceiveToResult(baseUrl + "/pox", new StringSource(content),
 				result);
-		assertXMLEqual(content, result.toString());
+		assertThat(result.toString()).and(content).areSimilar();
 		try {
 			template.sendSourceAndReceiveToResult(baseUrl + "/errors/notfound",
 					new StringSource(content), new StringResult());
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/pox/dom/DomPoxMessageTest.java b/spring-ws-core/src/test/java/org/springframework/ws/pox/dom/DomPoxMessageTest.java
index 5802ba8e0..6f65aa0de 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/pox/dom/DomPoxMessageTest.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/pox/dom/DomPoxMessageTest.java
@@ -29,7 +29,7 @@
 import org.junit.Test;
 import org.w3c.dom.Document;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.xmlunit.assertj.XmlAssert.assertThat;
 
 public class DomPoxMessageTest {
 
@@ -54,7 +54,7 @@ public void testGetPayload() throws Exception {
 		transformer.transform(source, message.getPayloadResult());
 		StringResult stringResult = new StringResult();
 		transformer.transform(message.getPayloadSource(), stringResult);
-		assertXMLEqual(content, stringResult.toString());
+		assertThat(stringResult.toString()).and(content).areSimilar();
 	}
 
 	@Test
@@ -64,7 +64,7 @@ public void testGetPayloadResultTwice() throws Exception {
 		transformer.transform(new StringSource(content), message.getPayloadResult());
 		StringResult stringResult = new StringResult();
 		transformer.transform(message.getPayloadSource(), stringResult);
-		assertXMLEqual(content, stringResult.toString());
+		assertThat(stringResult.toString()).and(content).areSimilar();
 	}
 
 	@Test
@@ -74,6 +74,6 @@ public void testWriteTo() throws Exception {
 		transformer.transform(source, message.getPayloadResult());
 		ByteArrayOutputStream os = new ByteArrayOutputStream();
 		message.writeTo(os);
-		assertXMLEqual(content, os.toString("UTF-8"));
+		assertThat(os.toString("UTF-8")).and(content).areSimilar();
 	}
 }
\ No newline at end of file
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractMessageEndpointTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractMessageEndpointTestCase.java
index 928e47578..e126d10fc 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractMessageEndpointTestCase.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractMessageEndpointTestCase.java
@@ -27,7 +27,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.xmlunit.assertj.XmlAssert.assertThat;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
@@ -67,7 +67,7 @@ protected final void testSource(Source requestSource) throws Exception {
 				new DefaultMessageContext(new MockWebServiceMessage(requestSource), new MockWebServiceMessageFactory());
 		endpoint.invoke(context);
 		assertTrue("No response message created", context.hasResponse());
-		assertXMLEqual(RESPONSE, ((MockWebServiceMessage) context.getResponse()).getPayloadAsString());
+		assertThat(((MockWebServiceMessage) context.getResponse()).getPayloadAsString()).and(RESPONSE).areSimilar();
 	}
 
 	protected abstract MessageEndpoint createNoResponseEndpoint();
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractPayloadEndpointTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractPayloadEndpointTestCase.java
index 2c98bb085..386c21792 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractPayloadEndpointTestCase.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractPayloadEndpointTestCase.java
@@ -26,7 +26,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.xmlunit.assertj.XmlAssert.assertThat;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
@@ -63,7 +63,7 @@ protected final void testSource(Source requestSource) throws Exception {
 		assertNotNull("No response source returned", responseSource);
 		StringResult result = new StringResult();
 		transformer.transform(responseSource, result);
-		assertXMLEqual(RESPONSE, result.toString());
+		assertThat(result.toString()).and(RESPONSE).areSimilar();
 	}
 
 	protected abstract PayloadEndpoint createNoResponseEndpoint() throws Exception;
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/MarshallingPayloadEndpointTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/MarshallingPayloadEndpointTest.java
index 1649f6f21..3a7c6f62b 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/MarshallingPayloadEndpointTest.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/MarshallingPayloadEndpointTest.java
@@ -27,7 +27,7 @@
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.xmlunit.assertj.XmlAssert.assertThat;
 import static org.easymock.EasyMock.*;
 import org.junit.Assert;
 import static org.junit.Assert.fail;
@@ -73,7 +73,7 @@ public Object unmarshal(Source source) throws XmlMappingException {
 				try {
 					StringWriter writer = new StringWriter();
 					transformer.transform(source, new StreamResult(writer));
-					assertXMLEqual("Invalid source", "<request/>", writer.toString());
+					assertThat(writer.toString()).and("<request/>").areSimilar();
 					return 42L;
 				}
 				catch (Exception e) {
@@ -112,7 +112,7 @@ protected Object invokeInternal(Object requestObject) throws Exception {
 		endpoint.invoke(context);
 		MockWebServiceMessage response = (MockWebServiceMessage) context.getResponse();
 		Assert.assertNotNull("Invalid result", response);
-		assertXMLEqual("Invalid response", "<result/>", response.getPayloadAsString());
+		assertThat(response.getPayloadAsString()).and("<result/>").areSimilar();
 
 		verify(factoryMock);
 	}
@@ -125,7 +125,7 @@ public Object unmarshal(Source source) throws XmlMappingException {
 				try {
 					StringWriter writer = new StringWriter();
 					transformer.transform(source, new StreamResult(writer));
-					assertXMLEqual("Invalid source", "<request/>", writer.toString());
+					assertThat(writer.toString()).and("<request/>").areSimilar();
 					return (long) 42;
 				}
 				catch (Exception e) {
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/StaxStreamPayloadEndpointTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/StaxStreamPayloadEndpointTest.java
index 45b9ce78f..f4c58ef5b 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/StaxStreamPayloadEndpointTest.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/StaxStreamPayloadEndpointTest.java
@@ -37,7 +37,7 @@
 import org.apache.axiom.soap.SOAPFactory;
 import org.junit.Test;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.xmlunit.assertj.XmlAssert.assertThat;
 import static org.junit.Assert.*;
 
 /**
@@ -114,7 +114,7 @@ public void testSaajResponse() throws Exception {
 		assertTrue("context has not response", context.hasResponse());
 		StringResult stringResult = new StringResult();
 		transformer.transform(context.getResponse().getPayloadSource(), stringResult);
-		assertXMLEqual(RESPONSE, stringResult.toString());
+		assertThat(stringResult.toString()).and(RESPONSE).areSimilar();
 	}
 
 	@Test
@@ -132,7 +132,7 @@ public void testAxiomResponse() throws Exception {
 		assertTrue("context has not response", context.hasResponse());
 		StringResult stringResult = new StringResult();
 		transformer.transform(context.getResponse().getPayloadSource(), stringResult);
-		assertXMLEqual(RESPONSE, stringResult.toString());
+		assertThat(stringResult.toString()).and(RESPONSE).areSimilar();
 	}
 
 	@Test
@@ -167,7 +167,7 @@ public void testAxiomResponseNoPayloadCaching() throws Exception {
 
 		StringResult stringResult = new StringResult();
 		transformer.transform(context.getResponse().getPayloadSource(), stringResult);
-		assertXMLEqual(RESPONSE, stringResult.toString());
+		assertThat(stringResult.toString()).and(RESPONSE).areSimilar();
 	}
 
 	@Test
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadEndpointAdapterTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadEndpointAdapterTest.java
index 0e138fa35..940c9dcba 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadEndpointAdapterTest.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadEndpointAdapterTest.java
@@ -34,7 +34,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.xmlunit.assertj.XmlAssert.assertThat;
 import static org.easymock.EasyMock.*;
 
 public class PayloadEndpointAdapterTest {
@@ -62,7 +62,7 @@ public void testInvoke() throws Exception {
 			public Source invoke(Source request) throws Exception {
 				StringWriter writer = new StringWriter();
 				transformer.transform(request, new StreamResult(writer));
-				assertXMLEqual("Invalid request", "<request/>", writer.toString());
+				assertThat(writer.toString()).and("<request/>").areSimilar();
 				return new StreamSource(new StringReader("<response/>"));
 			}
 		};
@@ -71,7 +71,7 @@ public Source invoke(Source request) throws Exception {
 		adapter.invoke(messageContext, endpoint);
 		MockWebServiceMessage response = (MockWebServiceMessage) messageContext.getResponse();
 		Assert.assertNotNull("No response created", response);
-		assertXMLEqual("Invalid payload", "<response/>", response.getPayloadAsString());
+		assertThat(response.getPayloadAsString()).and("<response/>").areSimilar();
 	}
 
 	@Test
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/AbstractPayloadMethodProcessorTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/AbstractPayloadMethodProcessorTestCase.java
index 4d7b0d03a..24ebeef31 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/AbstractPayloadMethodProcessorTestCase.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/AbstractPayloadMethodProcessorTestCase.java
@@ -25,7 +25,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.xmlunit.assertj.XmlAssert.assertThat;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
@@ -135,7 +135,7 @@ private void testHandleReturnValue(MessageContext messageContext) throws Excepti
 			Source responsePayload = messageContext.getResponse().getPayloadSource();
 			StringResult result = new StringResult();
 			transform(responsePayload, result);
-			assertXMLEqual(XML, result.toString());
+			assertThat(result.toString()).and(XML).areSimilar();
 		}
 	}
 
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/JaxbElementPayloadMethodProcessorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/JaxbElementPayloadMethodProcessorTest.java
index 6baeaa758..d15bff37f 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/JaxbElementPayloadMethodProcessorTest.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/JaxbElementPayloadMethodProcessorTest.java
@@ -40,7 +40,7 @@
 import org.springframework.ws.soap.axiom.AxiomSoapMessageFactory;
 import org.springframework.xml.transform.StringResult;
 
-import static org.custommonkey.xmlunit.XMLAssert.*;
+import static org.xmlunit.assertj.XmlAssert.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -96,7 +96,7 @@ public void handleReturnValue() throws Exception {
 		processor.handleReturnValue(messageContext, supportedReturnType, element);
 		assertTrue("context has no response", messageContext.hasResponse());
 		MockWebServiceMessage response = (MockWebServiceMessage) messageContext.getResponse();
-		assertXMLEqual("<type xmlns='http://springframework.org'><string>Foo</string></type>", response.getPayloadAsString());
+		assertThat(response.getPayloadAsString()).and("<type xmlns='http://springframework.org'><string>Foo</string></type>").ignoreWhitespace().areSimilar();
 	}
 
 	@Test
@@ -108,7 +108,7 @@ public void handleReturnValueString() throws Exception {
 		processor.handleReturnValue(messageContext, stringReturnType, element);
 		assertTrue("context has no response", messageContext.hasResponse());
 		MockWebServiceMessage response = (MockWebServiceMessage) messageContext.getResponse();
-		assertXMLEqual("<string xmlns='http://springframework.org'>Foo</string>", response.getPayloadAsString());
+		assertThat(response.getPayloadAsString()).and("<string xmlns='http://springframework.org'>Foo</string>").ignoreWhitespace().areSimilar();
 	}
 
 	@Test
@@ -137,17 +137,15 @@ public void handleReturnValueAxiom() throws Exception {
 		StringResult payloadResult = new StringResult();
 		transformer.transform(response.getPayloadSource(), payloadResult);
 
-		assertXMLEqual("<type xmlns='http://springframework.org'><string>Foo</string></type>",
-				payloadResult.toString());
+		assertThat(payloadResult.toString()).and("<type xmlns='http://springframework.org'><string>Foo</string></type>").areSimilar();
 
 		ByteArrayOutputStream bos = new ByteArrayOutputStream();
 		response.writeTo(bos);
 		String messageResult = bos.toString("UTF-8");
 
-		assertXMLEqual("<soapenv:Envelope xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/'><soapenv:Header/><soapenv:Body>" +
+		assertThat(messageResult).and("<soapenv:Envelope xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/'><soapenv:Header/><soapenv:Body>" +
 				"<type xmlns='http://springframework.org'><string>Foo</string></type>" +
-				"</soapenv:Body></soapenv:Envelope>", messageResult);
-
+				"</soapenv:Body></soapenv:Envelope>").areSimilar();
 	}
 
 
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/XmlRootElementPayloadMethodProcessorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/XmlRootElementPayloadMethodProcessorTest.java
index dd3766a85..67eb18336 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/XmlRootElementPayloadMethodProcessorTest.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/XmlRootElementPayloadMethodProcessorTest.java
@@ -50,7 +50,7 @@
 import org.springframework.xml.sax.AbstractXmlReader;
 import org.springframework.xml.transform.StringResult;
 
-import static org.custommonkey.xmlunit.XMLAssert.*;
+import static org.xmlunit.assertj.XmlAssert.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -175,7 +175,7 @@ public void handleReturnValue() throws Exception {
 		processor.handleReturnValue(messageContext, rootElementReturnType, rootElement);
 		assertTrue("context has no response", messageContext.hasResponse());
 		MockWebServiceMessage response = (MockWebServiceMessage) messageContext.getResponse();
-		assertXMLEqual("<root xmlns='http://springframework.org'><string>Foo</string></root>", response.getPayloadAsString());
+		assertThat(response.getPayloadAsString()).and("<root xmlns='http://springframework.org'><string>Foo</string></root>").ignoreWhitespace().areSimilar();
 	}
 
 	@Test
@@ -203,17 +203,15 @@ public void handleReturnValueAxiom() throws Exception {
 		StringResult payloadResult = new StringResult();
 		transformer.transform(response.getPayloadSource(), payloadResult);
 
-		assertXMLEqual("<root xmlns='http://springframework.org'><string>Foo</string></root>",
-				payloadResult.toString());
+		assertThat(payloadResult.toString()).and("<root xmlns='http://springframework.org'><string>Foo</string></root>").areSimilar();
 
 		ByteArrayOutputStream bos = new ByteArrayOutputStream();
 		response.writeTo(bos);
 		String messageResult = bos.toString("UTF-8");
 		
-		assertXMLEqual("<soapenv:Envelope xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/'><soapenv:Header/><soapenv:Body>" +
+		assertThat(messageResult).and("<soapenv:Envelope xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/'><soapenv:Header/><soapenv:Body>" +
 				"<root xmlns='http://springframework.org'><string>Foo</string></root>" +
-				"</soapenv:Body></soapenv:Envelope>", messageResult);
-
+				"</soapenv:Body></soapenv:Envelope>").ignoreWhitespace().areSimilar();
 	}
 
 	@Test
@@ -233,10 +231,9 @@ public void handleReturnValueAxiomNoPayloadCaching() throws Exception {
 		response.writeTo(bos);
 		String messageResult = bos.toString("UTF-8");
 
-		assertXMLEqual("<soapenv:Envelope xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/'><soapenv:Header/><soapenv:Body>" +
+		assertThat(messageResult).and("<soapenv:Envelope xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/'><soapenv:Header/><soapenv:Body>" +
 				"<root xmlns='http://springframework.org'><string>Foo</string></root>" +
-				"</soapenv:Body></soapenv:Envelope>", messageResult);
-
+				"</soapenv:Body></soapenv:Envelope>").areSimilar();
 	}
 
 	@ResponsePayload
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/interceptor/PayloadTransformingInterceptorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/interceptor/PayloadTransformingInterceptorTest.java
index d88cc9d7a..413d6cc3d 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/interceptor/PayloadTransformingInterceptorTest.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/interceptor/PayloadTransformingInterceptorTest.java
@@ -22,8 +22,7 @@
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.sax.SAXSource;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
-import org.custommonkey.xmlunit.XMLUnit;
+import static org.xmlunit.assertj.XmlAssert.assertThat;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -62,7 +61,6 @@ public void setUp() throws Exception {
 		input = new ClassPathResource("transformInput.xml", getClass());
 		output = new ClassPathResource("transformOutput.xml", getClass());
 		xslt = new ClassPathResource("transformation.xslt", getClass());
-		XMLUnit.setIgnoreWhitespace(true);
 	}
 
 	@Test
@@ -76,7 +74,7 @@ public void testHandleRequest() throws Exception {
 		Assert.assertTrue("Invalid interceptor result", result);
 		StringResult expected = new StringResult();
 		transformer.transform(new SAXSource(SaxUtils.createInputSource(output)), expected);
-		assertXMLEqual(expected.toString(), request.getPayloadAsString());
+		assertThat(request.getPayloadAsString()).and(expected.toString()).ignoreWhitespace().areSimilar();
 	}
 
 	@Test
@@ -90,7 +88,7 @@ public void testHandleRequestNoXslt() throws Exception {
 		Assert.assertTrue("Invalid interceptor result", result);
 		StringResult expected = new StringResult();
 		transformer.transform(new SAXSource(SaxUtils.createInputSource(input)), expected);
-		assertXMLEqual(expected.toString(), request.getPayloadAsString());
+		assertThat(request.getPayloadAsString()).and(expected.toString()).areSimilar();
 	}
 
 	@Test
@@ -106,7 +104,7 @@ public void testHandleResponse() throws Exception {
 		Assert.assertTrue("Invalid interceptor result", result);
 		StringResult expected = new StringResult();
 		transformer.transform(new SAXSource(SaxUtils.createInputSource(output)), expected);
-		assertXMLEqual(expected.toString(), response.getPayloadAsString());
+		assertThat(response.getPayloadAsString()).and(expected.toString()).ignoreWhitespace().areSimilar();
 	}
 
 	@Test
@@ -122,7 +120,7 @@ public void testHandleResponseNoXslt() throws Exception {
 		Assert.assertTrue("Invalid interceptor result", result);
 		StringResult expected = new StringResult();
 		transformer.transform(new SAXSource(SaxUtils.createInputSource(input)), expected);
-		assertXMLEqual(expected.toString(), response.getPayloadAsString());
+		assertThat(response.getPayloadAsString()).and(expected.toString()).areSimilar();
 	}
 
 	@Test
@@ -140,8 +138,7 @@ public void testSaaj() throws Exception {
 		transformer.transform(new SAXSource(SaxUtils.createInputSource(output)), expected);
 		StringResult result = new StringResult();
 		transformer.transform(message.getPayloadSource(), result);
-		assertXMLEqual(expected.toString(), result.toString());
-
+		assertThat(result.toString()).and(expected.toString()).ignoreWhitespace().areSimilar();
 	}
 
 	@Test
@@ -158,8 +155,7 @@ public void testPox() throws Exception {
 		transformer.transform(new SAXSource(SaxUtils.createInputSource(output)), expected);
 		StringResult result = new StringResult();
 		transformer.transform(message.getPayloadSource(), result);
-		assertXMLEqual(expected.toString(), result.toString());
-
+		assertThat(result.toString()).and(expected.toString()).ignoreWhitespace().areSimilar();
 	}
 
 	@Test
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapBodyTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapBodyTestCase.java
index aee0c4bf4..be50301a3 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapBodyTestCase.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapBodyTestCase.java
@@ -27,7 +27,7 @@
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.xmlunit.assertj.XmlAssert.assertThat;
 import static org.junit.Assert.*;
 
 public abstract class AbstractSoapBodyTestCase extends AbstractSoapElementTestCase {
@@ -77,7 +77,7 @@ public void testAddFaultWithExistingPayload() throws Exception {
 	protected void assertPayloadEqual(String expectedPayload) throws Exception {
 		StringResult result = new StringResult();
 		transformer.transform(soapBody.getPayloadSource(), result);
-		assertXMLEqual("Invalid payload contents", expectedPayload, result.toString());
+		assertThat(result.toString()).and(expectedPayload).areSimilar();
 	}
 
 }
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapHeaderTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapHeaderTestCase.java
index 3af56a143..0d2546881 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapHeaderTestCase.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapHeaderTestCase.java
@@ -24,7 +24,7 @@
 
 import org.junit.Test;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.xmlunit.assertj.XmlAssert.assertThat;
 import static org.junit.Assert.*;
 
 public abstract class AbstractSoapHeaderTestCase extends AbstractSoapElementTestCase {
@@ -82,9 +82,7 @@ public void testExamineAllHeaderElement() throws Exception {
 		assertEquals("Invalid qName for element", qName, headerElement.getName());
 		StringResult result = new StringResult();
 		transformer.transform(headerElement.getSource(), result);
-		assertXMLEqual("Invalid contents of header element",
-				"<spring:localName xmlns:spring='http://www.springframework.org'><spring:content/></spring:localName>",
-				result.toString());
+		assertThat(result.toString()).and("<spring:localName xmlns:spring='http://www.springframework.org'><spring:content/></spring:localName>").areSimilar();
 		assertFalse("header element iterator has too many elements", iterator.hasNext());
 	}
 
@@ -137,8 +135,6 @@ public void testGetResult() throws Exception {
 	protected void assertHeaderElementEqual(SoapHeaderElement headerElement, String expected) throws Exception {
 		StringResult result = new StringResult();
 		transformer.transform(headerElement.getSource(), result);
-		assertXMLEqual("Invalid contents of header element", expected, result.toString());
+		assertThat(result.toString()).and(expected).areSimilar();
 	}
-
-
 }
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageTestCase.java
index f317a0ea7..5c4dc7612 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageTestCase.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageTestCase.java
@@ -39,7 +39,7 @@
 import org.springframework.xml.validation.XmlValidator;
 import org.springframework.xml.validation.XmlValidatorFactory;
 
-import static org.custommonkey.xmlunit.XMLAssert.*;
+import static org.xmlunit.assertj.XmlAssert.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -123,7 +123,7 @@ public void writeTo(XMLStreamWriter streamWriter) throws XMLStreamException {
 		transformer.transform(streamingMessage.getPayloadSource(), result);
 
 		String expected = "<root xmlns='http://springframework.org'><child>Foo</child></root>";
-		assertXMLEqual(expected, result.toString());
+		assertThat(result.toString()).and(expected).areSimilar();
 
 		soapMessage.writeTo(new ByteArrayOutputStream());
 	}
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/AbstractWsAddressingTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/AbstractWsAddressingTestCase.java
index 6993b2bf2..a7dbd821f 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/AbstractWsAddressingTestCase.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/AbstractWsAddressingTestCase.java
@@ -23,13 +23,12 @@
 import javax.xml.soap.SOAPConstants;
 import javax.xml.soap.SOAPException;
 
-import org.custommonkey.xmlunit.XMLUnit;
 import org.junit.Before;
 import org.w3c.dom.Document;
 
 import org.springframework.ws.soap.saaj.SaajSoapMessage;
 
-import static org.custommonkey.xmlunit.XMLUnit.compareXML;
+import static org.xmlunit.assertj.XmlAssert.assertThat;
 import static org.junit.Assert.*;
 
 public abstract class AbstractWsAddressingTestCase {
@@ -39,10 +38,8 @@ public abstract class AbstractWsAddressingTestCase {
 	@Before
 	public void createMessageFactory() throws Exception {
 		messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_2_PROTOCOL);
-		XMLUnit.setIgnoreWhitespace(true);
 	}
 
-
 	protected SaajSoapMessage loadSaajMessage(String fileName) throws SOAPException, IOException {
 		MimeHeaders mimeHeaders = new MimeHeaders();
 		mimeHeaders.addHeader("Content-Type", " application/soap+xml");
@@ -56,15 +53,9 @@ protected SaajSoapMessage loadSaajMessage(String fileName) throws SOAPException,
 		}
 	}
 
-	protected void assertXMLEqual(String message, SaajSoapMessage expected, SaajSoapMessage result) {
-		Document expectedDocument = expected.getSaajMessage().getSOAPPart();
-		Document resultDocument = result.getSaajMessage().getSOAPPart();
-		org.custommonkey.xmlunit.XMLAssert.assertXMLEqual(message, expectedDocument, resultDocument);
-	}
-
-	protected void assertXMLSimilar(String message, SaajSoapMessage expected, SaajSoapMessage result) {
+	protected void assertXMLSimilar(SaajSoapMessage expected, SaajSoapMessage result) {
 		Document expectedDocument = expected.getSaajMessage().getSOAPPart();
 		Document resultDocument = result.getSaajMessage().getSOAPPart();
-		org.custommonkey.xmlunit.XMLAssert.assertXMLEqual(compareXML(expectedDocument, resultDocument), false);
+		assertThat(resultDocument).and(expectedDocument).ignoreWhitespace().areSimilar();
 	}
 }
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/AbstractActionCallbackTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/AbstractActionCallbackTestCase.java
index 94d4e081c..832ccc3aa 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/AbstractActionCallbackTestCase.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/AbstractActionCallbackTestCase.java
@@ -78,7 +78,7 @@ public void testValid() throws Exception {
 		callback.doWithMessage(message);
 
 		SaajSoapMessage expected = loadSaajMessage(getTestPath() + "/valid.xml");
-		assertXMLSimilar("Invalid message", expected, message);
+		assertXMLSimilar(expected, message);
 
 		verify(strategyMock, connectionMock);
 	}
@@ -100,7 +100,7 @@ public void testDefaults() throws Exception {
 		callback.doWithMessage(message);
 
 		SaajSoapMessage expected = loadSaajMessage(getTestPath() + "/valid.xml");
-		assertXMLSimilar("Invalid message", expected, message);
+		assertXMLSimilar(expected, message);
 		verify(strategyMock, connectionMock);
 	}
 
@@ -108,7 +108,7 @@ private SaajSoapMessage createDeleteMessage() throws SOAPException {
 		SOAPMessage saajMessage = messageFactory.createMessage();
 		SOAPBody saajBody = saajMessage.getSOAPBody();
 		SOAPBodyElement delete = saajBody.addBodyElement(new QName("http://example.com/fabrikam", "Delete"));
-		SOAPElement maxCount = delete.addChildElement(new QName("maxCount"));
+		SOAPElement maxCount = delete.addChildElement("maxCount");
 		maxCount.setTextContent("42");
 		return new SaajSoapMessage(saajMessage);
 	}
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AbstractAddressingInterceptorTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AbstractAddressingInterceptorTestCase.java
index a1a169fd1..aa274e045 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AbstractAddressingInterceptorTestCase.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AbstractAddressingInterceptorTestCase.java
@@ -96,8 +96,7 @@ public void testNoMessageId() throws Exception {
 		assertFalse("Request with no MessageID handled", result);
 		assertTrue("Message Context has no response", context.hasResponse());
 		SaajSoapMessage expectedResponse = loadSaajMessage(getTestPath() + "/response-no-message-id.xml");
-		assertXMLEqual("Invalid response for message with no MessageID", expectedResponse,
-				(SaajSoapMessage) context.getResponse());
+		assertXMLSimilar(expectedResponse, (SaajSoapMessage) context.getResponse());
 
 		verify(strategyMock);
 	}
@@ -115,8 +114,7 @@ public void testNoReplyTo() throws Exception {
 		assertTrue("Request with no ReplyTo not handled", result);
 		assertTrue("Message Context has no response", context.hasResponse());
 		SaajSoapMessage expectedResponse = loadSaajMessage(getTestPath() + "/response-anonymous.xml");
-		assertXMLEqual("Invalid response for message with invalid MAP", expectedResponse,
-				(SaajSoapMessage) context.getResponse());
+		assertXMLSimilar(expectedResponse, (SaajSoapMessage) context.getResponse());
 
 		verify(strategyMock);
 	}
@@ -133,8 +131,7 @@ public void testAnonymousReplyTo() throws Exception {
 		boolean result = interceptor.handleResponse(context, null);
 		assertTrue("Request with anonymous ReplyTo not handled", result);
 		SaajSoapMessage expectedResponse = loadSaajMessage(getTestPath() + "/response-anonymous.xml");
-		assertXMLEqual("Invalid response for message with invalid MAP", expectedResponse,
-				(SaajSoapMessage) context.getResponse());
+		assertXMLSimilar(expectedResponse, (SaajSoapMessage) context.getResponse());
 
 		verify(strategyMock);
 	}
@@ -162,8 +159,7 @@ public void testFaultTo() throws Exception {
 		boolean result = interceptor.handleFault(context, null);
 		assertTrue("Request with anonymous FaultTo not handled", result);
 		SaajSoapMessage expectedResponse = loadSaajMessage(getTestPath() + "/response-fault-to.xml");
-		assertXMLEqual("Invalid response for message with invalid MAP", expectedResponse,
-				(SaajSoapMessage) context.getResponse());
+		assertXMLSimilar(expectedResponse, (SaajSoapMessage) context.getResponse());
 		verify(strategyMock);
 	}
 
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AddressingInterceptor10Test.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AddressingInterceptor10Test.java
index e59d0f98c..00859db89 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AddressingInterceptor10Test.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AddressingInterceptor10Test.java
@@ -28,6 +28,7 @@
 
 import static org.easymock.EasyMock.*;
 import static org.junit.Assert.assertTrue;
+import static org.xmlunit.assertj.XmlAssert.assertThat;
 
 public class AddressingInterceptor10Test extends AbstractAddressingInterceptorTestCase {
 
@@ -51,9 +52,7 @@ public void testNoTo() throws Exception {
 		assertTrue("Request with no To not handled", result);
 		assertTrue("Message Context has no response", context.hasResponse());
 		SaajSoapMessage expectedResponse = loadSaajMessage(getTestPath() + "/response-anonymous.xml");
-		assertXMLEqual("Invalid response for message with invalid MAP", expectedResponse,
-				(SaajSoapMessage) context.getResponse());
+		assertThat(context.getResponse()).and(expectedResponse).areSimilar();
 		verify(strategyMock);
 	}
-
 }
\ No newline at end of file
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AnnotationActionMethodEndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AnnotationActionMethodEndpointMappingTest.java
index 13ab060b0..dfcbd8676 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AnnotationActionMethodEndpointMappingTest.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AnnotationActionMethodEndpointMappingTest.java
@@ -16,7 +16,6 @@
 
 package org.springframework.ws.soap.addressing.server;
 
-import org.custommonkey.xmlunit.XMLUnit;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.context.support.StaticApplicationContext;
@@ -56,7 +55,6 @@ public class AnnotationActionMethodEndpointMappingTest {
 	@Before
 	public void setUp() throws Exception {
 		messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_2_PROTOCOL);
-		XMLUnit.setIgnoreWhitespace(true);
 		applicationContext = new StaticApplicationContext();
 		applicationContext.registerSingleton("mapping", AnnotationActionEndpointMapping.class);
 		applicationContext.registerSingleton("interceptor", MyInterceptor.class);
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11MessageFactoryTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11MessageFactoryTest.java
index 457c5d8e8..e6a069fc0 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11MessageFactoryTest.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11MessageFactoryTest.java
@@ -30,13 +30,13 @@
 import org.springframework.ws.transport.TransportInputStream;
 import org.springframework.xml.transform.StringResult;
 
-import org.custommonkey.xmlunit.XMLAssert;
-import org.custommonkey.xmlunit.XMLUnit;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
+import static org.xmlunit.assertj.XmlAssert.assertThat;
+
 public class AxiomSoap11MessageFactoryTest extends AbstractSoap11MessageFactoryTestCase {
 
 	private Transformer transformer;
@@ -130,7 +130,6 @@ public void testSWS502() throws Exception {
 		StringResult result = new StringResult();
 		transformer.transform(message.getPayloadSource(), result);
 
-		XMLUnit.setIgnoreWhitespace(true);
 		String expectedPayload =
 				"<ns1:sendMessageResponse xmlns:ns1='urn:Sole' xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' soapenv:encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'>" +
 						"<sendMessageReturn xsi:type='soapenc:string' xmlns:soapenc='http://schemas.xmlsoap.org/soap/encoding/'>" +
@@ -138,8 +137,6 @@ public void testSWS502() throws Exception {
 						"<isStatusOK>true</isStatusOK>" + "<status>0</status>" +
 						"<payLoad><![CDATA[<?xml version='1.0' encoding='UTF-8'?><response>ok</response>]]]]>><![CDATA[</payLoad>" +
 						"</PDresponse>]]></sendMessageReturn>" + "</ns1:sendMessageResponse>";
-		XMLAssert.assertXMLEqual(expectedPayload, result.toString());
-
+		assertThat(result.toString()).and(expectedPayload).areSimilar();
 	}
-
 }
\ No newline at end of file
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/NonCachingPayloadTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/NonCachingPayloadTest.java
index fa096d3fa..995639495 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/NonCachingPayloadTest.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/NonCachingPayloadTest.java
@@ -27,7 +27,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.xmlunit.assertj.XmlAssert.assertThat;
 
 @SuppressWarnings("Since15")
 public class NonCachingPayloadTest {
@@ -63,7 +63,7 @@ public void testDelegatingStreamWriter() throws Exception {
 		String expected = "<soapenv:Body xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/'>" +
 				"<root xmlns='http://springframework.org/spring-ws'>" + "<child>text</child>" + "</root></soapenv:Body>"
 				;
-		assertXMLEqual(expected, writer.toString());
+		assertThat(writer.toString()).and(expected).areSimilar();
 	}
 
 	@Test
@@ -85,7 +85,7 @@ public void testDelegatingStreamWriterWriteEndDocument() throws Exception {
 		String expected = "<soapenv:Body xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/'>" +
 				"<root xmlns='http://springframework.org/spring-ws'>" + "<child>text</child>" + "</root></soapenv:Body>"
 				;
-		assertXMLEqual(expected, writer.toString());
+		assertThat(writer.toString()).and(expected).areSimilar();
 	}
 
 	@Test
@@ -105,6 +105,6 @@ public void testDelegatingStreamWriterWriteEmptyElement() throws Exception {
 
 		String expected = "<soapenv:Body xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/'>" +
 				"<root xmlns='http://springframework.org/spring-ws'>" + "<child />" + "</root></soapenv:Body>";
-		assertXMLEqual(expected, writer.toString());
+		assertThat(writer.toString()).and(expected).areSimilar();
 	}
 }
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/support/AxiomUtilsTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/support/AxiomUtilsTest.java
index 52f5c1a21..280f9ca02 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/support/AxiomUtilsTest.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/support/AxiomUtilsTest.java
@@ -35,13 +35,12 @@
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPMessage;
 import org.apache.axiom.soap.SOAPModelBuilder;
-import org.custommonkey.xmlunit.XMLUnit;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.w3c.dom.Document;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.xmlunit.assertj.XmlAssert.assertThat;
 
 public class AxiomUtilsTest {
 
@@ -52,7 +51,6 @@ public void setUp() throws Exception {
 		OMFactory factory = OMAbstractFactory.getOMFactory();
 		OMNamespace namespace = factory.createOMNamespace("http://www.springframework.org", "prefix");
 		element = factory.createOMElement("element", namespace);
-		XMLUnit.setIgnoreWhitespace(true);
 	}
 
 	@Test
@@ -117,7 +115,7 @@ public void testToDocument() throws Exception {
 
 		Document result = AxiomUtils.toDocument(soapMessage.getSOAPEnvelope());
 
-		assertXMLEqual("Invalid document generated from SOAPEnvelope", expected, result);
+		assertThat(result).and(expected).areSimilar();
 	}
 
 	@Test
@@ -137,6 +135,6 @@ public void testToEnvelope() throws Exception {
 		envelope.serialize(writer);
 		String result = writer.toString();
 
-		assertXMLEqual("Invalid SOAPEnvelope generated from document", expected, result);
+		assertThat(result).and(expected).areSimilar();
 	}
 }
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageTest.java
index 50a24effd..8bcc3ffe7 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageTest.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageTest.java
@@ -32,7 +32,7 @@
 import org.springframework.xml.transform.StringResult;
 import org.springframework.xml.transform.StringSource;
 
-import static org.custommonkey.xmlunit.XMLAssert.*;
+import static org.xmlunit.assertj.XmlAssert.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
@@ -64,7 +64,7 @@ public void testGetPayloadSource() throws Exception {
 		Source source = soapMessage.getPayloadSource();
 		StringResult result = new StringResult();
 		transformer.transform(source, result);
-		assertXMLEqual("Invalid source", "<child/>", result.toString());
+		assertThat(result.toString()).and("<child/>").areSimilar();
 	}
 
 	@Test
@@ -75,7 +75,7 @@ public void testGetPayloadSourceText() throws Exception {
 		Source source = soapMessage.getPayloadSource();
 		StringResult result = new StringResult();
 		transformer.transform(source, result);
-		assertXMLEqual("Invalid source", "<child/>", result.toString());
+		assertThat(result.toString()).and("<child/>").areSimilar();
 	}
 
 	@Test
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12MessageTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12MessageTest.java
index 109c55832..5faca0bb7 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12MessageTest.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12MessageTest.java
@@ -27,7 +27,7 @@
 import org.springframework.xml.transform.StringResult;
 import org.springframework.xml.transform.StringSource;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.xmlunit.assertj.XmlAssert.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
@@ -58,7 +58,7 @@ public void testGetPayloadSource() throws Exception {
 		Source source = soapMessage.getPayloadSource();
 		StringResult result = new StringResult();
 		transformer.transform(source, result);
-		assertXMLEqual("Invalid source", "<child/>", result.toString());
+		assertThat(result.toString()).and("<child/>").areSimilar();
 	}
 
 	public void testGetPayloadSourceText() throws Exception {
@@ -67,7 +67,7 @@ public void testGetPayloadSourceText() throws Exception {
 		Source source = soapMessage.getPayloadSource();
 		StringResult result = new StringResult();
 		transformer.transform(source, result);
-		assertXMLEqual("Invalid source", "<child/>", result.toString());
+		assertThat(result.toString()).and("<child/>").areSimilar();
 	}
 
 	public void testGetPayloadResult() throws Exception {
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajUtilsTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajUtilsTest.java
index 998bd13b9..edc9d41b3 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajUtilsTest.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajUtilsTest.java
@@ -36,7 +36,7 @@
 import org.junit.Test;
 import org.w3c.dom.Document;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.xmlunit.assertj.XmlAssert.assertThat;
 
 public class SaajUtilsTest {
 
@@ -125,7 +125,7 @@ public void testLoadMessage() throws Exception {
 		Document document = builder.parse(getClass().getResourceAsStream("soapMessage.xml"));
 		SOAPMessage soapMessage =
 				SaajUtils.loadMessage(new ClassPathResource("soapMessage.xml", getClass()), messageFactory);
-		assertXMLEqual(soapMessage.getSOAPPart(), document);
+		assertThat(document).and(soapMessage.getSOAPPart()).areSimilar();
 	}
 
 	@Test
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajXmlReaderTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajXmlReaderTest.java
index 63991ffd2..7eeb5b028 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajXmlReaderTest.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajXmlReaderTest.java
@@ -31,7 +31,7 @@
 import org.w3c.dom.Document;
 import org.xml.sax.InputSource;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.xmlunit.assertj.XmlAssert.assertThat;
 
 public class SaajXmlReaderTest {
 
@@ -59,7 +59,7 @@ public void testNamespacesPrefixes() throws Exception {
 		transformer.transform(source, result);
 		DOMResult expected = new DOMResult();
 		transformer.transform(new DOMSource(message.getSOAPPart().getEnvelope()), expected);
-		assertXMLEqual((Document) expected.getNode(), (Document) result.getNode());
+		assertThat(result.getNode()).and(expected.getNode()).areSimilar();
 	}
 
 	@Test
@@ -71,6 +71,6 @@ public void testNamespacesNoPrefixes() throws Exception {
 		transformer.transform(source, result);
 		DOMResult expected = new DOMResult();
 		transformer.transform(new DOMSource(message.getSOAPPart().getEnvelope()), expected);
-		assertXMLEqual((Document) expected.getNode(), (Document) result.getNode());
+		assertThat(result.getNode()).and(expected.getNode()).areSimilar();
 	}
 }
\ No newline at end of file
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadValidatingInterceptorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadValidatingInterceptorTest.java
index 1254a260c..0186c39e5 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadValidatingInterceptorTest.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadValidatingInterceptorTest.java
@@ -54,7 +54,7 @@
 import org.springframework.xml.validation.ValidationErrorHandler;
 import org.springframework.xml.xsd.SimpleXsdSchema;
 
-import static org.custommonkey.xmlunit.XMLAssert.*;
+import static org.xmlunit.assertj.XmlAssert.assertThat;
 
 public class PayloadValidatingInterceptorTest {
 
@@ -302,14 +302,12 @@ public void testCreateRequestValidationFaultAxiom() throws Exception {
 		interceptor.handleRequestValidationErrors(messageContext, exceptions);
 		ByteArrayOutputStream os = new ByteArrayOutputStream();
 		messageContext.getResponse().writeTo(os);
-		assertXMLEqual(
-				"<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\">" + "<soapenv:Header/>" + "<soapenv:Body>" +
+		assertThat(os.toString()).and("<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\">" + "<soapenv:Header/>" + "<soapenv:Body>" +
 						"<soapenv:Fault>" + "<faultcode>soapenv:Client</faultcode>" +
 						"<faultstring xml:lang='en'>Validation error</faultstring>" + "<detail>" +
 						"<spring-ws:ValidationError xmlns:spring-ws=\"http://springframework.org/spring-ws\">Message 1</spring-ws:ValidationError>" +
 						"<spring-ws:ValidationError xmlns:spring-ws=\"http://springframework.org/spring-ws\">Message 2</spring-ws:ValidationError>" +
-						"</detail>" + "</soapenv:Fault>" + "</soapenv:Body>" + "</soapenv:Envelope>", os.toString());
-
+						"</detail>" + "</soapenv:Fault>" + "</soapenv:Body>" + "</soapenv:Envelope>").areSimilar();
 	}
 
 	@Test
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11BodyTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11BodyTestCase.java
index f60c321c8..5566754fc 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11BodyTestCase.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11BodyTestCase.java
@@ -29,7 +29,7 @@
 
 import org.junit.Test;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.xmlunit.assertj.XmlAssert.assertThat;
 import static org.junit.Assert.*;
 
 public abstract class AbstractSoap11BodyTestCase extends AbstractSoapBodyTestCase {
@@ -48,8 +48,7 @@ public void testGetName() throws Exception {
 	public void testGetSource() throws Exception {
 		StringResult result = new StringResult();
 		transformer.transform(soapBody.getSource(), result);
-		assertXMLEqual("Invalid contents of body", "<Body xmlns='http://schemas.xmlsoap.org/soap/envelope/' />",
-				result.toString());
+		assertThat(result.toString()).and("<Body xmlns='http://schemas.xmlsoap.org/soap/envelope/' />").areSimilar();
 	}
 
 	@Test
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11EnvelopeTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11EnvelopeTestCase.java
index ad22fe063..7a1b82d21 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11EnvelopeTestCase.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11EnvelopeTestCase.java
@@ -24,7 +24,7 @@
 
 import org.junit.Test;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.xmlunit.assertj.XmlAssert.assertThat;
 import static org.junit.Assert.assertEquals;
 
 public abstract class AbstractSoap11EnvelopeTestCase extends AbstractSoapEnvelopeTestCase {
@@ -40,8 +40,6 @@ public void testGetName() throws Exception {
 	public void testGetContent() throws Exception {
 		StringResult result = new StringResult();
 		transformer.transform(soapEnvelope.getSource(), result);
-		assertXMLEqual("<Envelope xmlns='http://schemas.xmlsoap.org/soap/envelope/'><Header/><Body/></Envelope>",
-				result.toString());
+		assertThat(result.toString()).and("<Envelope xmlns='http://schemas.xmlsoap.org/soap/envelope/'><Header/><Body/></Envelope>").areSimilar();
 	}
-
 }
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11HeaderTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11HeaderTestCase.java
index dccac0328..d2a914091 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11HeaderTestCase.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11HeaderTestCase.java
@@ -19,7 +19,7 @@
 import java.util.Iterator;
 import javax.xml.namespace.QName;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.xmlunit.assertj.XmlAssert.assertThat;
 import static org.junit.Assert.*;
 import org.junit.Test;
 
@@ -47,8 +47,7 @@ public void testGetName() throws Exception {
 	public void testGetSource() throws Exception {
 		StringResult result = new StringResult();
 		transformer.transform(soapHeader.getSource(), result);
-		assertXMLEqual("Invalid contents of header",
-				"<SOAP-ENV:Header xmlns:SOAP-ENV='http://schemas.xmlsoap.org/soap/envelope/' />", result.toString());
+		assertThat(result.toString()).and("<SOAP-ENV:Header xmlns:SOAP-ENV='http://schemas.xmlsoap.org/soap/envelope/' />").areSimilar();
 	}
 
 	@Test
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageTestCase.java
index 0da1d2e76..f8cf3d7a8 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageTestCase.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageTestCase.java
@@ -37,7 +37,7 @@
 import org.springframework.ws.transport.MockTransportOutputStream;
 import org.springframework.xml.transform.StringSource;
 
-import static org.custommonkey.xmlunit.XMLAssert.*;
+import static org.xmlunit.assertj.XmlAssert.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -66,9 +66,7 @@ public void testWriteToTransportOutputStream() throws Exception {
 		soapMessage.setSoapAction(soapAction);
 		soapMessage.writeTo(tos);
 		String result = bos.toString("UTF-8");
-		assertXMLEqual(
-				"<" + getNS() + ":Envelope xmlns:" + getNS() + "='http://schemas.xmlsoap.org/soap/envelope/'>" + getHeader() + "<" + getNS() + ":Body><payload xmlns='http://www.springframework.org' /></" + getNS() + ":Body></" + getNS() + ":Envelope>",
-				result);
+		assertThat(result).and("<" + getNS() + ":Envelope xmlns:" + getNS() + "='http://schemas.xmlsoap.org/soap/envelope/'>" + getHeader() + "<" + getNS() + ":Body><payload xmlns='http://www.springframework.org' /></" + getNS() + ":Body></" + getNS() + ":Envelope>").areSimilar();
 		String contentType = tos.getHeaders().get("Content-Type");
 		assertTrue("Invalid Content-Type set", contentType.indexOf(SoapVersion.SOAP_11.getContentType()) != -1);
 		String resultSoapAction = tos.getHeaders().get("SOAPAction");
@@ -115,7 +113,7 @@ public void testToDocument() throws Exception {
 
 		Document result = soapMessage.getDocument();
 
-		assertXMLEqual(expected, result);
+		assertThat(result).and(expected).areSimilar();
 	}
 
 	@Override
@@ -131,9 +129,7 @@ public void testSetLiveDocument() throws Exception {
 		soapMessage.writeTo(bos);
 
 		String result = bos.toString("UTF-8");
-		assertXMLEqual(
-				"<" + getNS() + ":Envelope xmlns:" + getNS() + "='http://schemas.xmlsoap.org/soap/envelope/'>" + getHeader() + "<" + getNS() + ":Body><payload xmlns='http://www.springframework.org' /></" + getNS() + ":Body></" + getNS() + ":Envelope>",
-				result);
+		assertThat(result).and("<" + getNS() + ":Envelope xmlns:" + getNS() + "='http://schemas.xmlsoap.org/soap/envelope/'>" + getHeader() + "<" + getNS() + ":Body><payload xmlns='http://www.springframework.org' /></" + getNS() + ":Body></" + getNS() + ":Envelope>").areSimilar();
 	}
 
 	@Override
@@ -156,9 +152,7 @@ public void testSetOtherDocument() throws Exception {
 		soapMessage.writeTo(bos);
 
 		String result = bos.toString("UTF-8");
-		assertXMLEqual(
-				"<" + getNS() + ":Envelope xmlns:" + getNS() + "='http://schemas.xmlsoap.org/soap/envelope/'>" + getHeader() + "<" + getNS() + ":Body><payload xmlns='http://www.springframework.org' /></" + getNS() + ":Body></" + getNS() + ":Envelope>",
-				result);
+		assertThat(result).and("<" + getNS() + ":Envelope xmlns:" + getNS() + "='http://schemas.xmlsoap.org/soap/envelope/'>" + getHeader() + "<" + getNS() + ":Body><payload xmlns='http://www.springframework.org' /></" + getNS() + ":Body></" + getNS() + ":Envelope>").areSimilar();
 	}
 
 }
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12BodyTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12BodyTestCase.java
index a2ce13e1b..0ac355f5a 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12BodyTestCase.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12BodyTestCase.java
@@ -30,7 +30,7 @@
 
 import org.junit.Test;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.xmlunit.assertj.XmlAssert.assertThat;
 import static org.junit.Assert.*;
 
 public abstract class AbstractSoap12BodyTestCase extends AbstractSoapBodyTestCase {
@@ -50,8 +50,7 @@ public void testGetName() throws Exception {
 	public void testGetSource() throws Exception {
 		StringResult result = new StringResult();
 		transformer.transform(soapBody.getSource(), result);
-		assertXMLEqual("Invalid contents of body", "<Body xmlns='http://www.w3.org/2003/05/soap-envelope' />",
-				result.toString());
+		assertThat(result.toString()).and("<Body xmlns='http://www.w3.org/2003/05/soap-envelope' />").areSimilar();
 	}
 
 	@Test
@@ -61,12 +60,11 @@ public void testAddMustUnderstandFault() throws Exception {
 				fault.getFaultCode());
 		StringResult result = new StringResult();
 		transformer.transform(fault.getSource(), result);
-		assertXMLEqual("Invalid contents of body",
-				"<soapenv:Fault xmlns:soapenv='http://www.w3.org/2003/05/soap-envelope'>" +
+		assertThat(result.toString()).and("<soapenv:Fault xmlns:soapenv='http://www.w3.org/2003/05/soap-envelope'>" +
 						"<soapenv:Code><soapenv:Value>" + soapBody.getName().getPrefix() +
 						":MustUnderstand</soapenv:Value></soapenv:Code>" +
 						"<soapenv:Reason><soapenv:Text xml:lang='en'>SOAP Must Understand Error</soapenv:Text>" +
-						"</soapenv:Reason></soapenv:Fault>", result.toString());
+						"</soapenv:Reason></soapenv:Fault>").areSimilar();
 	}
 
 	@Test
@@ -76,12 +74,11 @@ public void testAddSenderFault() throws Exception {
 				fault.getFaultCode());
 		StringResult result = new StringResult();
 		transformer.transform(fault.getSource(), result);
-		assertXMLEqual("Invalid contents of body",
-				"<soapenv:Fault xmlns:soapenv='http://www.w3.org/2003/05/soap-envelope'>" +
+		assertThat(result.toString()).and("<soapenv:Fault xmlns:soapenv='http://www.w3.org/2003/05/soap-envelope'>" +
 						"<soapenv:Code><soapenv:Value>" + soapBody.getName().getPrefix() +
 						":Sender</soapenv:Value></soapenv:Code>" +
 						"<soapenv:Reason><soapenv:Text xml:lang='en'>faultString</soapenv:Text></soapenv:Reason>" +
-						"</soapenv:Fault>", result.toString());
+						"</soapenv:Fault>").areSimilar();
 	}
 
 	@Test
@@ -91,12 +88,11 @@ public void testAddReceiverFault() throws Exception {
 				fault.getFaultCode());
 		StringResult result = new StringResult();
 		transformer.transform(fault.getSource(), result);
-		assertXMLEqual("Invalid contents of body",
-				"<soapenv:Fault xmlns:soapenv='http://www.w3.org/2003/05/soap-envelope'>" +
+		assertThat(result.toString()).and("<soapenv:Fault xmlns:soapenv='http://www.w3.org/2003/05/soap-envelope'>" +
 						"<soapenv:Code><soapenv:Value>" + soapBody.getName().getPrefix() +
 						":Receiver</soapenv:Value></soapenv:Code>" +
 						"<soapenv:Reason><soapenv:Text xml:lang='en'>faultString</soapenv:Text></soapenv:Reason>" +
-						"</soapenv:Fault>", result.toString());
+						"</soapenv:Fault>").areSimilar();
 	}
 
 	@Test
@@ -109,13 +105,12 @@ public void testAddFaultWithDetail() throws Exception {
 		transformer.transform(detailContents, detailElement.getResult());
 		StringResult result = new StringResult();
 		transformer.transform(fault.getSource(), result);
-		assertXMLEqual("Invalid source for body",
-				"<soapenv:Fault xmlns:soapenv='http://www.w3.org/2003/05/soap-envelope'>" +
-						"<soapenv:Code><soapenv:Value>" + soapBody.getName().getPrefix() + ":Receiver</soapenv:Value>" +
-						"</soapenv:Code>" +
-						"<soapenv:Reason><soapenv:Text xml:lang='en'>faultString</soapenv:Text></soapenv:Reason>" +
-						"<soapenv:Detail><prefix:localPart xmlns:prefix='namespace'><detailContents xmlns='namespace'/>" +
-						"</prefix:localPart></soapenv:Detail></soapenv:Fault>", result.toString());
+		assertThat(result.toString()).and("<soapenv:Fault xmlns:soapenv='http://www.w3.org/2003/05/soap-envelope'>" +
+				"<soapenv:Code><soapenv:Value>" + soapBody.getName().getPrefix() + ":Receiver</soapenv:Value>" +
+				"</soapenv:Code>" +
+				"<soapenv:Reason><soapenv:Text xml:lang='en'>faultString</soapenv:Text></soapenv:Reason>" +
+				"<soapenv:Detail><prefix:localPart xmlns:prefix='namespace'><detailContents xmlns='namespace'/>" +
+				"</prefix:localPart></soapenv:Detail></soapenv:Fault>").areSimilar();
 	}
 
 	@Test
@@ -126,13 +121,12 @@ public void testAddFaultWithDetailResult() throws Exception {
 		transformer.transform(new StringSource("<detailContents xmlns='namespace'/>"), detail.getResult());
 		StringResult result = new StringResult();
 		transformer.transform(fault.getSource(), result);
-		assertXMLEqual("Invalid source for body",
-				"<soapenv:Fault xmlns:soapenv='http://www.w3.org/2003/05/soap-envelope'>" +
+		assertThat(result.toString()).and("<soapenv:Fault xmlns:soapenv='http://www.w3.org/2003/05/soap-envelope'>" +
 						"<soapenv:Code><soapenv:Value>" + soapBody.getName().getPrefix() + ":Receiver</soapenv:Value>" +
 						"</soapenv:Code>" +
 						"<soapenv:Reason><soapenv:Text xml:lang='en'>faultString</soapenv:Text></soapenv:Reason>" +
 						"<soapenv:Detail>" + "<detailContents xmlns='namespace'/>" +
-						"<detailContents xmlns='namespace'/>" + "</soapenv:Detail></soapenv:Fault>", result.toString());
+						"<detailContents xmlns='namespace'/>" + "</soapenv:Detail></soapenv:Fault>").areSimilar();
 	}
 
 	@Test
@@ -150,14 +144,13 @@ public void testAddFaultWithSubcode() throws Exception {
 		assertFalse("Subcode found", iterator.hasNext());
 		StringResult result = new StringResult();
 		transformer.transform(fault.getSource(), result);
-		assertXMLEqual("Invalid source for body",
-				"<soapenv:Fault xmlns:soapenv='http://www.w3.org/2003/05/soap-envelope'>" +
+		assertThat(result.toString()).and("<soapenv:Fault xmlns:soapenv='http://www.w3.org/2003/05/soap-envelope'>" +
 						"<soapenv:Code><soapenv:Value>" + soapBody.getName().getPrefix() + ":Receiver</soapenv:Value>" +
 						"<soapenv:Subcode><soapenv:Value xmlns:spring-ws='http://www.springframework.org'>spring-ws:Subcode1</soapenv:Value>" +
 						"<soapenv:Subcode><soapenv:Value xmlns:spring-ws='http://www.springframework.org'>spring-ws:Subcode2</soapenv:Value>" +
 						"</soapenv:Subcode></soapenv:Subcode></soapenv:Code>" +
 						"<soapenv:Reason><soapenv:Text xml:lang='en'>faultString</soapenv:Text></soapenv:Reason>" +
-						"</soapenv:Fault>", result.toString());
+						"</soapenv:Fault>").areSimilar();
 	}
 
 }
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12EnvelopeTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12EnvelopeTestCase.java
index 4e836e29b..184bebb76 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12EnvelopeTestCase.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12EnvelopeTestCase.java
@@ -24,7 +24,7 @@
 
 import org.junit.Test;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.xmlunit.assertj.XmlAssert.assertThat;
 import static org.junit.Assert.assertEquals;
 
 public abstract class AbstractSoap12EnvelopeTestCase extends AbstractSoapEnvelopeTestCase {
@@ -39,8 +39,7 @@ public void testGetName() throws Exception {
 	public void testGetSource() throws Exception {
 		StringResult result = new StringResult();
 		transformer.transform(soapEnvelope.getSource(), result);
-		assertXMLEqual("<Envelope xmlns='http://www.w3.org/2003/05/soap-envelope'><Header/>" + "<Body/></Envelope>",
-				result.toString());
+		assertThat(result.toString()).and("<Envelope xmlns='http://www.w3.org/2003/05/soap-envelope'><Header/>" + "<Body/></Envelope>").areSimilar();
 	}
 
 }
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12HeaderTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12HeaderTestCase.java
index df16127ee..99482de58 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12HeaderTestCase.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12HeaderTestCase.java
@@ -19,7 +19,7 @@
 import java.util.Iterator;
 import javax.xml.namespace.QName;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.xmlunit.assertj.XmlAssert.assertThat;
 import static org.junit.Assert.*;
 import org.junit.Test;
 
@@ -45,8 +45,7 @@ public void testGetName() throws Exception {
 	public void testGetSource() throws Exception {
 		StringResult result = new StringResult();
 		transformer.transform(soapHeader.getSource(), result);
-		assertXMLEqual("Invalid contents of header", "<Header xmlns='http://www.w3.org/2003/05/soap-envelope' />",
-				result.toString());
+		assertThat(result.toString()).and("<Header xmlns='http://www.w3.org/2003/05/soap-envelope' />").areSimilar();
 	}
 
 	@Test
@@ -56,9 +55,9 @@ public void testAddNotUnderstood() throws Exception {
 		soap12Header.addNotUnderstoodHeaderElement(headerName);
 		StringResult result = new StringResult();
 		transformer.transform(soapHeader.getSource(), result);
-		assertXMLEqual("Invalid contents of header", "<Header xmlns='http://www.w3.org/2003/05/soap-envelope' >" +
+		assertThat(result.toString()).and("<Header xmlns='http://www.w3.org/2003/05/soap-envelope' >" +
 				"<NotUnderstood qname='spring-ws:NotUnderstood' xmlns:spring-ws='http://www.springframework.org' />" +
-				"</Header>", result.toString());
+				"</Header>").areSimilar();
 	}
 
 	@Test
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageTestCase.java
index 91ce754ad..c7f6b03ef 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageTestCase.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageTestCase.java
@@ -38,7 +38,7 @@
 import org.springframework.ws.transport.TransportConstants;
 import org.springframework.xml.transform.StringSource;
 
-import static org.custommonkey.xmlunit.XMLAssert.*;
+import static org.xmlunit.assertj.XmlAssert.assertThat;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
@@ -68,9 +68,7 @@ public void testWriteToTransportOutputStream() throws Exception {
 		soapMessage.setSoapAction(soapAction);
 		soapMessage.writeTo(tos);
 		String result = bos.toString("UTF-8");
-		assertXMLEqual(
-				"<" + getNS() + ":Envelope xmlns:" + getNS() + "='http://www.w3.org/2003/05/soap-envelope'>" + getHeader() + "<" + getNS() + ":Body><payload xmlns='http://www.springframework.org' /></" + getNS() + ":Body></" + getNS() + ":Envelope>",
-				result);
+		assertThat(result).and("<" + getNS() + ":Envelope xmlns:" + getNS() + "='http://www.w3.org/2003/05/soap-envelope'>" + getHeader() + "<" + getNS() + ":Body><payload xmlns='http://www.springframework.org' /></" + getNS() + ":Body></" + getNS() + ":Envelope>").areSimilar();
 		String contentType = tos.getHeaders().get(TransportConstants.HEADER_CONTENT_TYPE);
 		assertTrue("Invalid Content-Type set",
 				contentType.contains(SoapVersion.SOAP_12.getContentType()));
@@ -119,7 +117,7 @@ public void testToDocument() throws Exception {
 
 		Document result = soapMessage.getDocument();
 
-		assertXMLEqual(expected, result);
+		assertThat(result).and(expected).areSimilar();
 	}
 
 	@Override
@@ -135,9 +133,7 @@ public void testSetLiveDocument() throws Exception {
 		soapMessage.writeTo(bos);
 
 		String result = bos.toString("UTF-8");
-		assertXMLEqual(
-				"<" + getNS() + ":Envelope xmlns:" + getNS() + "='http://www.w3.org/2003/05/soap-envelope'>" + getHeader() + "<" + getNS() + ":Body><payload xmlns='http://www.springframework.org' /></" + getNS() + ":Body></" + getNS() + ":Envelope>",
-				result);
+		assertThat(result).and("<" + getNS() + ":Envelope xmlns:" + getNS() + "='http://www.w3.org/2003/05/soap-envelope'>" + getHeader() + "<" + getNS() + ":Body><payload xmlns='http://www.springframework.org' /></" + getNS() + ":Body></" + getNS() + ":Envelope>").areSimilar();
 	}
 
 	@Override
@@ -160,12 +156,6 @@ public void testSetOtherDocument() throws Exception {
 		soapMessage.writeTo(bos);
 
 		String result = bos.toString("UTF-8");
-		assertXMLEqual(
-				"<" + getNS() + ":Envelope xmlns:" + getNS() + "='http://www.w3.org/2003/05/soap-envelope'>" + getHeader() + "<" + getNS() + ":Body><payload xmlns='http://www.springframework.org' /></" + getNS() + ":Body></" + getNS() + ":Envelope>",
-				result);
+		assertThat(result).and("<" + getNS() + ":Envelope xmlns:" + getNS() + "='http://www.w3.org/2003/05/soap-envelope'>" + getHeader() + "<" + getNS() + ":Body><payload xmlns='http://www.springframework.org' /></" + getNS() + ":Body></" + getNS() + ":Envelope>").areSimilar();
 	}
-
-
-
-
 }
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSenderIntegrationTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSenderIntegrationTestCase.java
index e8afa9f1d..2589a7bc5 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSenderIntegrationTestCase.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSenderIntegrationTestCase.java
@@ -36,7 +36,6 @@
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMResult;
 
-import org.custommonkey.xmlunit.XMLUnit;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -57,7 +56,7 @@
 import org.springframework.xml.transform.StringResult;
 import org.springframework.xml.transform.StringSource;
 
-import static org.custommonkey.xmlunit.XMLAssert.*;
+import static org.xmlunit.assertj.XmlAssert.assertThat;
 import static org.junit.Assert.assertEquals;
 
 public abstract class AbstractHttpWebServiceMessageSenderIntegrationTestCase<T extends AbstractHttpWebServiceMessageSender> {
@@ -106,7 +105,6 @@ public final void setUp() throws Exception {
 		if (messageSender instanceof InitializingBean) {
 			((InitializingBean) messageSender).afterPropertiesSet();
 		}
-		XMLUnit.setIgnoreWhitespace(true);
 		saajMessageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_1_PROTOCOL);
 		messageFactory = new SaajSoapMessageFactory(saajMessageFactory);
 		transformerFactory = TransformerFactory.newInstance();
@@ -209,7 +207,7 @@ private void validateResponse(Servlet servlet) throws Exception {
 			StringResult result = new StringResult();
 			Transformer transformer = transformerFactory.newTransformer();
 			transformer.transform(response.getPayloadSource(), result);
-			assertXMLEqual("Invalid response", RESPONSE, result.toString());
+			assertThat(result.toString()).and(RESPONSE).areSimilar();
 		}
 		finally {
 			connection.close();
@@ -276,7 +274,7 @@ protected void doPost(HttpServletRequest httpServletRequest, HttpServletResponse
 						httpServletRequest.getHeader(REQUEST_HEADER_NAME));
 				String receivedRequest =
 						new String(FileCopyUtils.copyToByteArray(httpServletRequest.getInputStream()), "UTF-8");
-				assertXMLEqual("Invalid request received", SOAP_REQUEST, receivedRequest);
+				assertThat(receivedRequest).and(SOAP_REQUEST).areSimilar();
 				if (gzip) {
 					assertEquals("Invalid Accept-Encoding header value received on server side", "gzip",
 							httpServletRequest.getHeader("Accept-Encoding"));
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpServletConnectionTest.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpServletConnectionTest.java
index 53dc9dd83..acfe45b8e 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpServletConnectionTest.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpServletConnectionTest.java
@@ -24,7 +24,7 @@
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerFactory;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.xmlunit.assertj.XmlAssert.assertThat;
 import org.junit.Assert;
 import static org.junit.Assert.assertEquals;
 import org.junit.Before;
@@ -82,7 +82,7 @@ public void receive() throws Exception {
 		StringResult result = new StringResult();
 		Transformer transformer = transformerFactory.newTransformer();
 		transformer.transform(message.getPayloadSource(), result);
-		assertXMLEqual("Invalid message", CONTENT, result.toString());
+		assertThat(result.toString()).and(CONTENT).areSimilar();
 		SOAPMessage saajMessage = message.getSaajMessage();
 		String[] headerValues = saajMessage.getMimeHeaders().getHeader(HEADER_NAME);
 		Assert.assertNotNull("Response has no header", headerValues);
@@ -103,7 +103,7 @@ public void send() throws Exception {
 
 		assertEquals("Invalid header", HEADER_VALUE,
 				httpServletResponse.getHeader(HEADER_NAME));
-		assertXMLEqual("Invalid content", SOAP_CONTENT, httpServletResponse.getContentAsString());
+		assertThat(httpServletResponse.getContentAsString()).and(SOAP_CONTENT).areSimilar();
 	}
 
 	@Test
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletIntegrationTest.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletIntegrationTest.java
index ee3dc35e9..906b71477 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletIntegrationTest.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletIntegrationTest.java
@@ -36,7 +36,7 @@
 import org.mortbay.jetty.servlet.Context;
 import org.mortbay.jetty.servlet.ServletHolder;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.xmlunit.assertj.XmlAssert.assertThat;
 
 /**
  * @author Arjen Poutsma
@@ -89,8 +89,6 @@ public void echo() throws SOAPException {
 
 		SOAPMessage response = connection.call(request, url);
 
-		assertXMLEqual(request.getSOAPPart(), response.getSOAPPart());
+		assertThat(response.getSOAPPart()).and(request.getSOAPPart()).areSimilar();
 	}
-
-
 }
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletTest.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletTest.java
index 2ccf2bbcf..b061a2c20 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletTest.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletTest.java
@@ -37,13 +37,12 @@
 import org.springframework.ws.soap.server.endpoint.SimpleSoapExceptionResolver;
 import org.springframework.ws.wsdl.wsdl11.SimpleWsdl11Definition;
 
-import org.custommonkey.xmlunit.XMLUnit;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.w3c.dom.Document;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.xmlunit.assertj.XmlAssert.assertThat;
 
 public class MessageDispatcherServletTest {
 
@@ -95,8 +94,7 @@ public void testDetectWsdlDefinitions() throws Exception {
 		DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
 		Document result = documentBuilder.parse(new ByteArrayInputStream(response.getContentAsByteArray()));
 		Document expected = documentBuilder.parse(getClass().getResourceAsStream("wsdl11-input.wsdl"));
-		XMLUnit.setIgnoreWhitespace(true);
-		assertXMLEqual("Invalid WSDL written", expected, result);
+		assertThat(result).and(expected).areSimilar();
 	}
 
 	private static class DetectWebApplicationContext extends StaticWebApplicationContext {
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/WsdlDefinitionHandlerAdapterTest.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/WsdlDefinitionHandlerAdapterTest.java
index 0d7c1575a..d8cfe6c1a 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/WsdlDefinitionHandlerAdapterTest.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/WsdlDefinitionHandlerAdapterTest.java
@@ -35,7 +35,7 @@
 import org.junit.Test;
 import org.w3c.dom.Document;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.xmlunit.assertj.XmlAssert.assertThat;
 import static org.easymock.EasyMock.*;
 
 public class WsdlDefinitionHandlerAdapterTest {
@@ -66,7 +66,7 @@ public void handleGet() throws Exception {
 		replay(definitionMock);
 
 		adapter.handle(request, response, definitionMock);
-		assertXMLEqual(definition, response.getContentAsString());
+		assertThat(response.getContentAsString()).and(definition).areSimilar();
 
 		verify(definitionMock);
 	}
@@ -104,7 +104,7 @@ public void transformLocations() throws Exception {
 		Document result = documentBuilder.parse(getClass().getResourceAsStream("wsdl11-input.wsdl"));
 		adapter.transformLocations(result, request);
 		Document expectedDocument = documentBuilder.parse(getClass().getResourceAsStream("wsdl11-expected.wsdl"));
-		assertXMLEqual("Invalid result", expectedDocument, result);
+		assertThat(result).and(expectedDocument).areSimilar();
 
 		verify(definitionMock);
 	}
@@ -192,7 +192,7 @@ public void handleSimpleWsdl11DefinitionWithoutTransformLocations() throws Excep
 
 		documentBuilder = documentBuilderFactory.newDocumentBuilder();
 		Document expectedDocument = documentBuilder.parse(getClass().getResourceAsStream("echo-input.wsdl"));
-		assertXMLEqual("Invalid WSDL returned", expectedDocument, resultingDocument);
+		assertThat(resultingDocument).and(expectedDocument).areSimilar();
 	}
 
 	@Test
@@ -222,7 +222,7 @@ public void handleSimpleWsdl11DefinitionWithTransformLocation() throws Exception
 
 		documentBuilder = documentBuilderFactory.newDocumentBuilder();
 		Document expectedDocument = documentBuilder.parse(getClass().getResourceAsStream("echo-expected.wsdl"));
-		assertXMLEqual("Invalid WSDL returned", expectedDocument, resultingDocument);
+		assertThat(resultingDocument).and(expectedDocument).areSimilar();
 	}
 
 }
\ No newline at end of file
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/XsdSchemaHandlerAdapterTest.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/XsdSchemaHandlerAdapterTest.java
index 0b0e77975..c049298de 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/XsdSchemaHandlerAdapterTest.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/XsdSchemaHandlerAdapterTest.java
@@ -33,7 +33,7 @@
 import org.junit.Test;
 import org.w3c.dom.Document;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.xmlunit.assertj.XmlAssert.assertThat;
 import static org.junit.Assert.assertEquals;
 
 public class XsdSchemaHandlerAdapterTest {
@@ -69,7 +69,7 @@ public void handleGet() throws Exception {
 		schema.afterPropertiesSet();
 		adapter.handle(request, response, schema);
 		String expected = new String(FileCopyUtils.copyToByteArray(single.getFile()));
-		assertXMLEqual(expected, response.getContentAsString());
+		assertThat(response.getContentAsString()).and(expected).areSimilar();
 	}
 
 	@Test
@@ -106,7 +106,7 @@ public void handleGetWithTransformLocation() throws Exception {
 
 		documentBuilder = documentBuilderFactory.newDocumentBuilder();
 		Document expectedDocument = documentBuilder.parse(getClass().getResourceAsStream("importing-expected.xsd"));
-		assertXMLEqual("Invalid WSDL returned", expectedDocument, resultingDocument);
+		assertThat(resultingDocument).and(expectedDocument).areSimilar();
 	}
 
 }
\ No newline at end of file
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/DefaultWsdl11DefinitionTest.java b/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/DefaultWsdl11DefinitionTest.java
index 51c17eca6..646e6851b 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/DefaultWsdl11DefinitionTest.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/DefaultWsdl11DefinitionTest.java
@@ -27,12 +27,11 @@
 import org.springframework.xml.xsd.SimpleXsdSchema;
 import org.springframework.xml.xsd.commons.CommonsXsdSchemaCollection;
 
-import org.custommonkey.xmlunit.XMLUnit;
 import org.junit.Before;
 import org.junit.Test;
 import org.w3c.dom.Document;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.xmlunit.assertj.XmlAssert.assertThat;
 
 public class DefaultWsdl11DefinitionTest {
 
@@ -50,7 +49,6 @@ public void setUp() throws Exception {
 		DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
 		documentBuilderFactory.setNamespaceAware(true);
 		documentBuilder = documentBuilderFactory.newDocumentBuilder();
-		XMLUnit.setIgnoreWhitespace(true);
 	}
 
 	@Test
@@ -72,8 +70,7 @@ public void testSingle() throws Exception {
 		Document result = (Document) domResult.getNode();
 		Document expected = documentBuilder.parse(getClass().getResourceAsStream("single-inline.wsdl"));
 
-		assertXMLEqual("Invalid WSDL built", expected, result);
-
+		assertThat(result).and(expected).ignoreWhitespace().areSimilar();
 	}
 
 	@Test
@@ -94,7 +91,7 @@ public void testInclude() throws Exception {
 
 		Document result = (Document) domResult.getNode();
 		Document expected = documentBuilder.parse(getClass().getResourceAsStream("include-inline.wsdl"));
-		assertXMLEqual("Invalid WSDL built", expected, result);
+		assertThat(result).and(expected).ignoreWhitespace().areSimilar();
 	}
 
 	@Test
@@ -115,7 +112,7 @@ public void testImport() throws Exception {
 
 		Document result = (Document) domResult.getNode();
 		Document expected = documentBuilder.parse(getClass().getResourceAsStream("import-inline.wsdl"));
-		assertXMLEqual("Invalid WSDL built", expected, result);
+		assertThat(result).and(expected).ignoreWhitespace().areSimilar();
 	}
 
 	@Test
@@ -139,9 +136,6 @@ public void testSoap11And12() throws Exception {
 		Document result = (Document) domResult.getNode();
 		Document expected = documentBuilder.parse(getClass().getResourceAsStream("soap-11-12.wsdl"));
 
-		assertXMLEqual("Invalid WSDL built", expected, result);
-
+		assertThat(result).and(expected).ignoreWhitespace().areSimilar();
 	}
-
-
 }
\ No newline at end of file
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/Wsdl4jDefinitionTest.java b/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/Wsdl4jDefinitionTest.java
index de42e5728..22de90172 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/Wsdl4jDefinitionTest.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/Wsdl4jDefinitionTest.java
@@ -27,14 +27,13 @@
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMResult;
 
-import org.custommonkey.xmlunit.XMLUnit;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.w3c.dom.Document;
 import org.xml.sax.InputSource;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.xmlunit.assertj.XmlAssert.assertThat;
 
 public class Wsdl4jDefinitionTest {
 
@@ -44,7 +43,6 @@ public class Wsdl4jDefinitionTest {
 
 	@Before
 	public void setUp() throws Exception {
-		XMLUnit.setIgnoreWhitespace(true);
 		WSDLFactory factory = WSDLFactory.newInstance();
 		WSDLReader reader = factory.newWSDLReader();
 		InputStream is = getClass().getResourceAsStream("complete.wsdl");
@@ -68,6 +66,6 @@ public void testGetSource() throws Exception {
 		documentBuilderFactory.setNamespaceAware(true);
 		DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
 		Document expected = documentBuilder.parse(getClass().getResourceAsStream("complete.wsdl"));
-		assertXMLEqual(expected, (Document) result.getNode());
+		assertThat(result.getNode()).and(expected).ignoreWhitespace().areSimilar();
 	}
 }
\ No newline at end of file
diff --git a/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/response-anonymous.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/response-anonymous.xml
index 2ba120412..8f5a86df8 100644
--- a/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/response-anonymous.xml
+++ b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/response-anonymous.xml
@@ -1,9 +1,9 @@
 <env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:wsa="http://www.w3.org/2005/08/addressing">
     <env:Header>
-        <wsa:MessageID>uid:1234</wsa:MessageID>
-        <wsa:RelatesTo>http://example.com/someuniquestring</wsa:RelatesTo>
         <wsa:To env:mustUnderstand="true">http://www.w3.org/2005/08/addressing/anonymous</wsa:To>
         <wsa:Action>urn:replyAction</wsa:Action>
+        <wsa:MessageID>uid:1234</wsa:MessageID>
+        <wsa:RelatesTo>http://example.com/someuniquestring</wsa:RelatesTo>
     </env:Header>
     <env:Body/>
 </env:Envelope>
diff --git a/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/response-fault-to.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/response-fault-to.xml
index 4e0392db7..7882d906b 100644
--- a/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/response-fault-to.xml
+++ b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/response-fault-to.xml
@@ -1,9 +1,9 @@
 <env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:wsa="http://www.w3.org/2005/08/addressing">
     <env:Header>
-        <wsa:MessageID>uid:1234</wsa:MessageID>
-        <wsa:RelatesTo>http://example.com/someuniquestring</wsa:RelatesTo>
         <wsa:To env:mustUnderstand="true">http://www.w3.org/2005/08/addressing/anonymous</wsa:To>
         <wsa:Action>urn:faultAction</wsa:Action>
+        <wsa:MessageID>uid:1234</wsa:MessageID>
+        <wsa:RelatesTo>http://example.com/someuniquestring</wsa:RelatesTo>
     </env:Header>
     <env:Body>
         <env:Fault>
diff --git a/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/valid.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/valid.xml
index e44c1df87..bca3e59ba 100644
--- a/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/valid.xml
+++ b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/valid.xml
@@ -1,11 +1,11 @@
 <S:Envelope xmlns:S="http://www.w3.org/2003/05/soap-envelope" xmlns:wsa="http://www.w3.org/2005/08/addressing">
     <S:Header>
-        <wsa:MessageID>http://example.com/someuniquestring</wsa:MessageID>
+        <wsa:To S:mustUnderstand="true">mailto:fabrikam@example.com</wsa:To>
         <wsa:ReplyTo>
             <wsa:Address>http://example.com/business/client1</wsa:Address>
         </wsa:ReplyTo>
-        <wsa:To S:mustUnderstand="true">mailto:fabrikam@example.com</wsa:To>
         <wsa:Action>http://example.com/fabrikam/mail/Delete</wsa:Action>
+        <wsa:MessageID>http://example.com/someuniquestring</wsa:MessageID>
     </S:Header>
     <S:Body>
         <f:Delete xmlns:f="http://example.com/fabrikam">
diff --git a/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/200408/response-anonymous.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/200408/response-anonymous.xml
index 992762631..288218963 100644
--- a/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/200408/response-anonymous.xml
+++ b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/200408/response-anonymous.xml
@@ -1,10 +1,10 @@
 <env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"
               xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing">
     <env:Header>
-        <wsa:MessageID>uid:1234</wsa:MessageID>
-        <wsa:RelatesTo>uuid:aaaabbbb-cccc-dddd-eeee-ffffffffffff</wsa:RelatesTo>
         <wsa:To env:mustUnderstand="true">http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</wsa:To>
         <wsa:Action>urn:replyAction</wsa:Action>
+        <wsa:MessageID>uid:1234</wsa:MessageID>
+        <wsa:RelatesTo>uuid:aaaabbbb-cccc-dddd-eeee-ffffffffffff</wsa:RelatesTo>
     </env:Header>
     <env:Body/>
 </env:Envelope>
diff --git a/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/200408/response-fault-to.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/200408/response-fault-to.xml
index 4751eb0e9..2b6f97149 100644
--- a/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/200408/response-fault-to.xml
+++ b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/200408/response-fault-to.xml
@@ -1,10 +1,10 @@
 <env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"
               xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing">
     <env:Header>
-        <wsa:MessageID>uid:1234</wsa:MessageID>
-        <wsa:RelatesTo>uuid:aaaabbbb-cccc-dddd-eeee-ffffffffffff</wsa:RelatesTo>
         <wsa:To env:mustUnderstand="true">http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</wsa:To>
         <wsa:Action>urn:faultAction</wsa:Action>
+        <wsa:MessageID>uid:1234</wsa:MessageID>
+        <wsa:RelatesTo>uuid:aaaabbbb-cccc-dddd-eeee-ffffffffffff</wsa:RelatesTo>
     </env:Header>
     <env:Body>
         <env:Fault>
diff --git a/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/200408/valid.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/200408/valid.xml
index fb813b6ef..c1a89f733 100644
--- a/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/200408/valid.xml
+++ b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/200408/valid.xml
@@ -1,12 +1,12 @@
 <S:Envelope xmlns:S="http://www.w3.org/2003/05/soap-envelope"
             xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing">
     <S:Header>
-        <wsa:MessageID>http://example.com/someuniquestring</wsa:MessageID>
+        <wsa:To S:mustUnderstand="true">mailto:fabrikam@example.com</wsa:To>
         <wsa:ReplyTo>
             <wsa:Address>http://example.com/business/client1</wsa:Address>
         </wsa:ReplyTo>
-        <wsa:To S:mustUnderstand="true">mailto:fabrikam@example.com</wsa:To>
         <wsa:Action>http://example.com/fabrikam/mail/Delete</wsa:Action>
+        <wsa:MessageID>http://example.com/someuniquestring</wsa:MessageID>
     </S:Header>
     <S:Body>
         <f:Delete xmlns:f="http://example.com/fabrikam">
diff --git a/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/JmsIntegrationTest.java b/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/JmsIntegrationTest.java
index d138105c5..4ef880c25 100644
--- a/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/JmsIntegrationTest.java
+++ b/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/JmsIntegrationTest.java
@@ -23,7 +23,7 @@
 import org.springframework.xml.transform.StringResult;
 import org.springframework.xml.transform.StringSource;
 
-import org.custommonkey.xmlunit.XMLAssert;
+import static org.xmlunit.assertj.XmlAssert.assertThat;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -44,7 +44,7 @@ public void testTemporaryQueue() throws Exception {
 		String content = "<root xmlns='http://springframework.org/spring-ws'><child/></root>";
 		StringResult result = new StringResult();
 		webServiceTemplate.sendSourceAndReceiveToResult(new StringSource(content), result);
-		XMLAssert.assertXMLEqual("Invalid content received", content, result.toString());
+		assertThat(result.toString()).and(content).areSimilar();
 	}
 
 	@Test
@@ -53,6 +53,6 @@ public void testPermanentQueue() throws Exception {
 		String content = "<root xmlns='http://springframework.org/spring-ws'><child/></root>";
 		StringResult result = new StringResult();
 		webServiceTemplate.sendSourceAndReceiveToResult(url, new StringSource(content), result);
-		XMLAssert.assertXMLEqual("Invalid content received", content, result.toString());
+		assertThat(result.toString()).and(content).areSimilar();
 	}
 }
diff --git a/spring-ws-support/src/test/java/org/springframework/ws/transport/mail/MailIntegrationTest.java b/spring-ws-support/src/test/java/org/springframework/ws/transport/mail/MailIntegrationTest.java
index 986af38f3..904ffaab6 100644
--- a/spring-ws-support/src/test/java/org/springframework/ws/transport/mail/MailIntegrationTest.java
+++ b/spring-ws-support/src/test/java/org/springframework/ws/transport/mail/MailIntegrationTest.java
@@ -24,7 +24,7 @@
 import org.springframework.xml.transform.StringResult;
 import org.springframework.xml.transform.StringSource;
 
-import org.custommonkey.xmlunit.XMLAssert;
+import static org.xmlunit.assertj.XmlAssert.assertThat;
 import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -56,8 +56,7 @@ public void testMailTransport() throws Exception {
 		applicationContext.close();
 		assertEquals("Server mail message not deleted", 0, Mailbox.get("server@example.com").size());
 		assertEquals("No client mail message received", 1, Mailbox.get("client@example.com").size());
-		XMLAssert.assertXMLEqual("Invalid content received", content, result.toString());
-
+		assertThat(result.toString()).and(content).areSimilar();
 	}
 
 }
diff --git a/spring-ws-test/pom.xml b/spring-ws-test/pom.xml
index 1b08578b4..652469178 100644
--- a/spring-ws-test/pom.xml
+++ b/spring-ws-test/pom.xml
@@ -35,8 +35,8 @@
 		</dependency>
 
 		<dependency>
-			<groupId>xmlunit</groupId>
-			<artifactId>xmlunit</artifactId>
+			<groupId>org.xmlunit</groupId>
+			<artifactId>xmlunit-core</artifactId>
 			<version>${xmlunit.version}</version>
 		</dependency>
 
diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/DiffMatcher.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/DiffMatcher.java
index 937f1e650..33e8d5469 100644
--- a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/DiffMatcher.java
+++ b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/DiffMatcher.java
@@ -18,28 +18,24 @@
 
 import java.io.IOException;
 
-import org.custommonkey.xmlunit.Diff;
-import org.custommonkey.xmlunit.XMLUnit;
 import static org.springframework.ws.test.support.AssertionErrors.assertTrue;
 
 import org.springframework.ws.WebServiceMessage;
+import org.xmlunit.diff.Diff;
 
 /**
  * Implementation of {@link WebServiceMessageMatcher} based on XMLUnit's {@link Diff}.
  *
  * @author Arjen Poutsma
+ * @author Leandro Quiroga
  * @since 2.0
  */
 public abstract class DiffMatcher implements WebServiceMessageMatcher {
 
-	static {
-		XMLUnit.setIgnoreWhitespace(true);
-	}
-
 	@Override
 	public final void match(WebServiceMessage message) throws IOException, AssertionError {
 		Diff diff = createDiff(message);
-		assertTrue("Messages are different, " + diff.toString(), diff.similar(), "Payload", message.getPayloadSource());
+		assertTrue("Messages are different, " + diff.toString(), !diff.hasDifferences(), "Payload", message.getPayloadSource());
 	}
 
 	/**
diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/PayloadDiffMatcher.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/PayloadDiffMatcher.java
index 2021f21cc..7e9c09b69 100644
--- a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/PayloadDiffMatcher.java
+++ b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/PayloadDiffMatcher.java
@@ -24,8 +24,11 @@
 import org.springframework.ws.WebServiceMessage;
 import org.springframework.xml.transform.TransformerHelper;
 
-import org.custommonkey.xmlunit.Diff;
 import org.w3c.dom.Document;
+import org.xmlunit.builder.DiffBuilder;
+import org.xmlunit.diff.DefaultNodeMatcher;
+import org.xmlunit.diff.Diff;
+import org.xmlunit.diff.ElementSelectors;
 
 import static org.springframework.ws.test.support.AssertionErrors.fail;
 
@@ -34,6 +37,7 @@
  *
  * @author Arjen Poutsma
  * @author Lukas Krecan
+ * @author Leandro Quiroga
  * @since 2.0
  */
 public class PayloadDiffMatcher extends DiffMatcher {
@@ -59,7 +63,7 @@ protected final Diff createDiff(WebServiceMessage message) {
 	protected Diff createDiff(Source payload) {
 		Document expectedDocument = createDocumentFromSource(expected);
 		Document actualDocument = createDocumentFromSource(payload);
-		return new Diff(expectedDocument, actualDocument);
+		return DiffBuilder.compare(expectedDocument).withTest(actualDocument).withNodeMatcher(new DefaultNodeMatcher(ElementSelectors.byName)).ignoreWhitespace().checkForSimilar().build();
 	}
 
 	private Document createDocumentFromSource(Source source) {
diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/SoapEnvelopeDiffMatcher.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/SoapEnvelopeDiffMatcher.java
index 78338955c..c87a9cdc2 100644
--- a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/SoapEnvelopeDiffMatcher.java
+++ b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/SoapEnvelopeDiffMatcher.java
@@ -25,9 +25,11 @@
 import org.springframework.ws.soap.SoapMessage;
 import org.springframework.xml.transform.TransformerHelper;
 
-import org.custommonkey.xmlunit.Diff;
-import org.custommonkey.xmlunit.XMLUnit;
 import org.w3c.dom.Document;
+import org.xmlunit.builder.DiffBuilder;
+import org.xmlunit.diff.DefaultNodeMatcher;
+import org.xmlunit.diff.Diff;
+import org.xmlunit.diff.ElementSelectors;
 
 import static org.springframework.ws.test.support.AssertionErrors.assertTrue;
 import static org.springframework.ws.test.support.AssertionErrors.fail;
@@ -36,6 +38,7 @@
  * Matches {@link Source} SOAP envelopes.
  *
  * @author Alexander Shutyaev
+ * @author Leandro Quiroga
  * @since 2.1.1
  */
 public class SoapEnvelopeDiffMatcher extends AbstractSoapMessageMatcher {
@@ -44,10 +47,6 @@ public class SoapEnvelopeDiffMatcher extends AbstractSoapMessageMatcher {
 
 	private final TransformerHelper transformerHelper = new TransformerHelper();
 
-	static {
-		XMLUnit.setIgnoreWhitespace(true);
-	}
-
 	public SoapEnvelopeDiffMatcher(Source expected) {
 		Assert.notNull(expected, "'expected' must not be null");
 		this.expected = expected;
@@ -57,8 +56,8 @@ public SoapEnvelopeDiffMatcher(Source expected) {
 	protected void match(SoapMessage soapMessage) throws IOException, AssertionError {
 		Document actualDocument = soapMessage.getDocument();
 		Document expectedDocument = createDocumentFromSource(expected);
-		Diff diff = new Diff(expectedDocument, actualDocument);
-		assertTrue("Envelopes are different, " + diff.toString(), diff.similar());
+		Diff diff = DiffBuilder.compare(expectedDocument).withTest(actualDocument).withNodeMatcher(new DefaultNodeMatcher(ElementSelectors.byName)).ignoreWhitespace().checkForSimilar().build();
+		assertTrue("Envelopes are different, " + diff.toString(), !diff.hasDifferences());
 	}
 
 	private Document createDocumentFromSource(Source source) {
diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/client/MockWebServiceServerTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/client/MockWebServiceServerTest.java
index ee78d5784..1dab61777 100644
--- a/spring-ws-test/src/test/java/org/springframework/ws/test/client/MockWebServiceServerTest.java
+++ b/spring-ws-test/src/test/java/org/springframework/ws/test/client/MockWebServiceServerTest.java
@@ -43,7 +43,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.xmlunit.assertj.XmlAssert.assertThat;
 import static org.easymock.EasyMock.*;
 import static org.junit.Assert.assertNotNull;
 import static org.springframework.ws.test.client.RequestMatchers.*;
@@ -142,7 +142,7 @@ public void payloadMatch() throws Exception {
 
 		StringResult result = new StringResult();
 		template.sendSourceAndReceiveToResult(request, result);
-		assertXMLEqual(result.toString(), response.toString());
+		assertThat(response.toString()).and(result.toString()).areSimilar();
 	}
 
 	@Test(expected = AssertionError.class)
@@ -264,7 +264,7 @@ public void anythingMatch() throws Exception {
 
 		StringResult result = new StringResult();
 		template.sendSourceAndReceiveToResult(request, result);
-		assertXMLEqual(result.toString(), response.toString());
+		assertThat(response.toString()).and(result.toString()).areSimilar();
 
 		server.verify();
 	}
@@ -279,7 +279,7 @@ public void recordWhenReplay() throws Exception {
 
 		StringResult result = new StringResult();
 		template.sendSourceAndReceiveToResult(request, result);
-		assertXMLEqual(result.toString(), response.toString());
+		assertThat(response.toString()).and(result.toString()).areSimilar();
 
 		server.expect(anything()).andRespond(withPayload(response));
 	}
diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/client/ResponseCreatorsTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/client/ResponseCreatorsTest.java
index b6591ff57..73adc1505 100644
--- a/spring-ws-test/src/test/java/org/springframework/ws/test/client/ResponseCreatorsTest.java
+++ b/spring-ws-test/src/test/java/org/springframework/ws/test/client/ResponseCreatorsTest.java
@@ -36,7 +36,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.xmlunit.assertj.XmlAssert.assertThat;
 import static org.junit.Assert.*;
 
 public class ResponseCreatorsTest {
@@ -58,8 +58,7 @@ public void withPayloadSource() throws Exception {
 
 		WebServiceMessage response = responseCreator.createResponse(null, null, messageFactory);
 
-		assertXMLEqual(payload, getPayloadAsString(response));
-
+		assertThat(getPayloadAsString(response)).and(payload).areSimilar();
 	}
 
 	@Test
@@ -70,7 +69,7 @@ public void withPayloadResource() throws Exception {
 
 		WebServiceMessage response = responseCreator.createResponse(null, null, messageFactory);
 
-		assertXMLEqual(payload, getPayloadAsString(response));
+		assertThat(getPayloadAsString(response)).and(payload).areSimilar();
 	}
 	
 	@Test
@@ -84,7 +83,7 @@ public void withSoapEnvelopeSource() throws Exception {
 		String envelope = xmlBuilder.toString();
 		ResponseCreator responseCreator = ResponseCreators.withSoapEnvelope(new StringSource(envelope));
 		WebServiceMessage response = responseCreator.createResponse(null, null, messageFactory);
-		assertXMLEqual(envelope, getSoapEnvelopeAsString((SoapMessage)response));
+		assertThat(getSoapEnvelopeAsString((SoapMessage)response)).and(envelope).areSimilar();
 	}
 	
 	@Test
@@ -98,7 +97,7 @@ public void withSoapEnvelopeResource() throws Exception {
 		String envelope = xmlBuilder.toString();
 		ResponseCreator responseCreator = ResponseCreators.withSoapEnvelope(new ByteArrayResource(envelope.getBytes("UTF-8")));
 		WebServiceMessage response = responseCreator.createResponse(null, null, messageFactory);
-		assertXMLEqual(envelope, getSoapEnvelopeAsString((SoapMessage)response));
+		assertThat(getSoapEnvelopeAsString((SoapMessage)response)).and(envelope).areSimilar();
 	}
 
 	@Test
diff --git a/spring-xml/src/test/java/org/springframework/xml/dom/DomContentHandlerTest.java b/spring-xml/src/test/java/org/springframework/xml/dom/DomContentHandlerTest.java
index 216372776..69b41cb62 100644
--- a/spring-xml/src/test/java/org/springframework/xml/dom/DomContentHandlerTest.java
+++ b/spring-xml/src/test/java/org/springframework/xml/dom/DomContentHandlerTest.java
@@ -28,7 +28,7 @@
 import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.XMLReaderFactory;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.xmlunit.assertj.XmlAssert.assertThat;
 
 public class DomContentHandlerTest {
 
@@ -69,7 +69,7 @@ public void testContentHandlerDocumentNamespacePrefixes() throws Exception {
 		expected = documentBuilder.parse(new InputSource(new StringReader(XML_1)));
 		xmlReader.setContentHandler(handler);
 		xmlReader.parse(new InputSource(new StringReader(XML_1)));
-		assertXMLEqual("Invalid result", expected, result);
+		assertThat(result).and(expected).areSimilar();
 	}
 
 	@Test
@@ -78,7 +78,7 @@ public void testContentHandlerDocumentNoNamespacePrefixes() throws Exception {
 		expected = documentBuilder.parse(new InputSource(new StringReader(XML_1)));
 		xmlReader.setContentHandler(handler);
 		xmlReader.parse(new InputSource(new StringReader(XML_1)));
-		assertXMLEqual("Invalid result", expected, result);
+		assertThat(result).and(expected).areSimilar();
 	}
 
 	@Test
@@ -89,7 +89,6 @@ public void testContentHandlerElement() throws Exception {
 		expected = documentBuilder.parse(new InputSource(new StringReader(XML_2_EXPECTED)));
 		xmlReader.setContentHandler(handler);
 		xmlReader.parse(new InputSource(new StringReader(XML_2_SNIPPET)));
-		assertXMLEqual("Invalid result", expected, result);
-
+		assertThat(result).and(expected).areSimilar();
 	}
 }
\ No newline at end of file
diff --git a/spring-xml/src/test/java/org/springframework/xml/transform/StringResultTest.java b/spring-xml/src/test/java/org/springframework/xml/transform/StringResultTest.java
index cdc30532a..09ca8d6e4 100644
--- a/spring-xml/src/test/java/org/springframework/xml/transform/StringResultTest.java
+++ b/spring-xml/src/test/java/org/springframework/xml/transform/StringResultTest.java
@@ -25,7 +25,7 @@
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.xmlunit.assertj.XmlAssert.assertThat;
 
 public class StringResultTest {
 
@@ -37,7 +37,7 @@ public void testStringResult() throws Exception {
 		Transformer transformer = TransformerFactory.newInstance().newTransformer();
 		StringResult result = new StringResult();
 		transformer.transform(new DOMSource(document), result);
-		assertXMLEqual("Invalid result", "<prefix:localName xmlns:prefix='namespace'/>", result.toString());
+		assertThat(result.toString()).and("<prefix:localName xmlns:prefix='namespace'/>").areSimilar();
 	}
 
 }
\ No newline at end of file
diff --git a/spring-xml/src/test/java/org/springframework/xml/transform/TransformerHelperTest.java b/spring-xml/src/test/java/org/springframework/xml/transform/TransformerHelperTest.java
index d86681d10..bd9760b03 100644
--- a/spring-xml/src/test/java/org/springframework/xml/transform/TransformerHelperTest.java
+++ b/spring-xml/src/test/java/org/springframework/xml/transform/TransformerHelperTest.java
@@ -19,25 +19,21 @@
 import java.io.IOException;
 import javax.xml.transform.Result;
 import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerException;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.xml.sax.SAXException;
 
-import static org.custommonkey.xmlunit.XMLAssert.*;
-import static org.easymock.EasyMock.*;
+import static org.xmlunit.assertj.XmlAssert.assertThat;
 
 public class TransformerHelperTest {
 
 	private TransformerHelper helper;
-	private Transformer transformer;
 
 	@Before
 	public void setUp() throws Exception {
 		helper = new TransformerHelper();
-		transformer = createMock(Transformer.class);
 	}
 
 	@Test
@@ -59,7 +55,7 @@ private void doTest() throws TransformerException, SAXException, IOException {
 
 		helper.transform(source, result);
 
-		assertXMLEqual(xml, result.toString());
+		assertThat(result.toString()).and(xml).areSimilar();
 	}
 
 }
diff --git a/spring-xml/src/test/java/org/springframework/xml/xsd/AbstractXsdSchemaTestCase.java b/spring-xml/src/test/java/org/springframework/xml/xsd/AbstractXsdSchemaTestCase.java
index e8aaefddd..30e7417be 100644
--- a/spring-xml/src/test/java/org/springframework/xml/xsd/AbstractXsdSchemaTestCase.java
+++ b/spring-xml/src/test/java/org/springframework/xml/xsd/AbstractXsdSchemaTestCase.java
@@ -27,13 +27,13 @@
 import org.springframework.xml.sax.SaxUtils;
 import org.springframework.xml.validation.XmlValidator;
 
-import org.custommonkey.xmlunit.XMLUnit;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.w3c.dom.Document;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.xmlunit.assertj.XmlAssert.assertThat;
+
 
 public abstract class AbstractXsdSchemaTestCase {
 
@@ -48,7 +48,6 @@ public final void setUp() throws Exception {
 		documentBuilder = documentBuilderFactory.newDocumentBuilder();
 		TransformerFactory transformerFactory = TransformerFactory.newInstance();
 		transformer = transformerFactory.newTransformer();
-		XMLUnit.setIgnoreWhitespace(true);
 	}
 
 	@Test
@@ -62,7 +61,7 @@ public void testSingle() throws Exception {
 		DOMResult domResult = new DOMResult();
 		transformer.transform(single.getSource(), domResult);
 		Document result = (Document) domResult.getNode();
-		assertXMLEqual("Invalid Source returned", expected, result);
+		assertThat(result).and(expected).ignoreWhitespace().areSimilar();
 	}
 
 	@Test
@@ -76,7 +75,7 @@ public void testIncludes() throws Exception {
 		DOMResult domResult = new DOMResult();
 		transformer.transform(including.getSource(), domResult);
 		Document result = (Document) domResult.getNode();
-		assertXMLEqual("Invalid Source returned", expected, result);
+		assertThat(result).and(expected).ignoreWhitespace().areSimilar();
 	}
 
 	@Test
@@ -90,7 +89,7 @@ public void testImports() throws Exception {
 		DOMResult domResult = new DOMResult();
 		transformer.transform(importing.getSource(), domResult);
 		Document result = (Document) domResult.getNode();
-		assertXMLEqual("Invalid Source returned", expected, result);
+		assertThat(result).and(expected).ignoreWhitespace().areSimilar();
 	}
 
 	@Test
@@ -104,7 +103,7 @@ public void testXmlNamespace() throws Exception {
 		DOMResult domResult = new DOMResult();
 		transformer.transform(importing.getSource(), domResult);
 		Document result = (Document) domResult.getNode();
-		assertXMLEqual("Invalid Source returned", expected, result);
+		assertThat(result).and(expected).ignoreWhitespace().areSimilar();
 	}
 
 	@Test
diff --git a/spring-xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollectionTest.java b/spring-xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollectionTest.java
index 229b52428..d47662bd1 100644
--- a/spring-xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollectionTest.java
+++ b/spring-xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollectionTest.java
@@ -29,13 +29,12 @@
 import org.springframework.xml.xsd.AbstractXsdSchemaTestCase;
 import org.springframework.xml.xsd.XsdSchema;
 
-import org.custommonkey.xmlunit.XMLUnit;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.w3c.dom.Document;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.xmlunit.assertj.XmlAssert.assertThat;
 
 public class CommonsXsdSchemaCollectionTest {
 
@@ -53,7 +52,6 @@ public void setUp() throws Exception {
 		DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
 		documentBuilderFactory.setNamespaceAware(true);
 		documentBuilder = documentBuilderFactory.newDocumentBuilder();
-		XMLUnit.setIgnoreWhitespace(true);
 	}
 
 	@Test
@@ -78,14 +76,14 @@ public void testInlineComplex() throws Exception {
 		Document expected = documentBuilder.parse(SaxUtils.createInputSource(abc));
 		DOMResult domResult = new DOMResult();
 		transformer.transform(schemas[0].getSource(), domResult);
-		assertXMLEqual("Invalid XSD generated", expected, (Document) domResult.getNode());
+		assertThat(domResult.getNode()).and(expected).ignoreWhitespace().areSimilar();
 
 		Assert.assertEquals("Invalid target namespace", "urn:2", schemas[1].getTargetNamespace());
 		Resource cd = new ClassPathResource("CD.xsd", AbstractXsdSchemaTestCase.class);
 		expected = documentBuilder.parse(SaxUtils.createInputSource(cd));
 		domResult = new DOMResult();
 		transformer.transform(schemas[1].getSource(), domResult);
-		assertXMLEqual("Invalid XSD generated", expected, (Document) domResult.getNode());
+		assertThat(domResult.getNode()).and(expected).ignoreWhitespace().areSimilar();
 	}
 
 	@Test
@@ -147,14 +145,13 @@ public void testIncludesAndImports() throws Exception {
 		Document expected = documentBuilder.parse(SaxUtils.createInputSource(hr_employee));
 		DOMResult domResult = new DOMResult();
 		transformer.transform(schemas[0].getSource(), domResult);
-		assertXMLEqual("Invalid XSD generated", expected, (Document) domResult.getNode());
+		assertThat(domResult.getNode()).and(expected).ignoreWhitespace().areSimilar();
 
 		Assert.assertEquals("Invalid target namespace", "http://mycompany.com/hr/schemas/holiday", schemas[1].getTargetNamespace());
 		Resource holiday = new ClassPathResource("holiday.xsd", getClass());
 		expected = documentBuilder.parse(SaxUtils.createInputSource(holiday));
 		domResult = new DOMResult();
 		transformer.transform(schemas[1].getSource(), domResult);
-		assertXMLEqual("Invalid XSD generated", expected, (Document) domResult.getNode());
-
+		assertThat(domResult.getNode()).and(expected).ignoreWhitespace().areSimilar();
 	}
 }
\ No newline at end of file