diff --git a/build.gradle b/build.gradle
index ae46305d279..449c158b47c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -60,7 +60,7 @@ configure(allprojects) { project ->
 	ext.slf4jVersion         = "1.7.25"	 // spring-jcl + consistent 3rd party deps
 	ext.tiles3Version        = "3.0.8"
 	ext.tomcatVersion        = "8.5.30"
-	ext.undertowVersion      = "1.4.23.Final"
+	ext.undertowVersion      = "1.4.24.Final"
 
 	ext.gradleScriptDir = "${rootProject.projectDir}/gradle"
 
@@ -155,7 +155,6 @@ configure(allprojects) { project ->
 			exclude module:'mockito-core'
 		}
 		testCompile("org.hamcrest:hamcrest-all:1.3")
-		testCompile("org.xmlunit:xmlunit-matchers:2.3.0")
 		testRuntime("org.apache.logging.log4j:log4j-core:${log4jVersion}")
 		testRuntime("org.apache.logging.log4j:log4j-slf4j-impl:${log4jVersion}")
 		testRuntime("org.apache.logging.log4j:log4j-jul:${log4jVersion}")
diff --git a/spring-core/spring-core.gradle b/spring-core/spring-core.gradle
index 0d635ad9275..03ac8ee44b4 100644
--- a/spring-core/spring-core.gradle
+++ b/spring-core/spring-core.gradle
@@ -86,8 +86,9 @@ dependencies {
 	optional("io.reactivex.rxjava2:rxjava:${rxjava2Version}")
 	optional("io.netty:netty-buffer")
 	testCompile("io.projectreactor:reactor-test")
-	testCompile("javax.xml.bind:jaxb-api:2.3.0")
 	testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
+	testCompile("org.xmlunit:xmlunit-matchers:2.5.1")
+	testCompile("javax.xml.bind:jaxb-api:2.3.0")
 	testCompile("com.fasterxml.woodstox:woodstox-core:5.0.3") {
 		exclude group: "stax", module: "stax-api"
 	}
diff --git a/spring-messaging/spring-messaging.gradle b/spring-messaging/spring-messaging.gradle
index ef90ded378e..97b28b4656d 100644
--- a/spring-messaging/spring-messaging.gradle
+++ b/spring-messaging/spring-messaging.gradle
@@ -41,6 +41,7 @@ dependencies {
 	testCompile("org.apache.tomcat.embed:tomcat-embed-websocket:${tomcatVersion}")
 	testCompile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
 	testCompile("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
+	testCompile("org.xmlunit:xmlunit-matchers:2.5.1")
 	testRuntime("com.sun.xml.bind:jaxb-core:2.3.0")
 	testRuntime("com.sun.xml.bind:jaxb-impl:2.3.0")
 	testRuntime("com.sun.activation:javax.activation:1.2.0")
diff --git a/spring-oxm/spring-oxm.gradle b/spring-oxm/spring-oxm.gradle
index c0ef3d60b0c..41aa46da2f1 100644
--- a/spring-oxm/spring-oxm.gradle
+++ b/spring-oxm/spring-oxm.gradle
@@ -117,6 +117,7 @@ dependencies {
 	}
 	testCompile(files(genCastor.classesDir).builtBy(genCastor))
 	testCompile(files(genJaxb.classesDir).builtBy(genJaxb))
+	testCompile("org.xmlunit:xmlunit-matchers:2.5.1")
 	testRuntime("xerces:xercesImpl:2.11.0")  // for Castor
 	testRuntime("com.sun.xml.bind:jaxb-core:2.3.0")
 	testRuntime("com.sun.xml.bind:jaxb-impl:2.3.0")
diff --git a/spring-web/spring-web.gradle b/spring-web/spring-web.gradle
index cbe034d1b96..65178923e03 100644
--- a/spring-web/spring-web.gradle
+++ b/spring-web/spring-web.gradle
@@ -82,6 +82,7 @@ dependencies {
 	testCompile("com.squareup.okhttp3:mockwebserver:3.10.0")
 	testCompile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
 	testCompile("org.skyscreamer:jsonassert:1.5.0")
+	testCompile("org.xmlunit:xmlunit-matchers:2.5.1")
 	testRuntime("com.sun.mail:javax.mail:1.6.1")
 	testRuntime("com.sun.xml.bind:jaxb-core:2.3.0")
 	testRuntime("com.sun.xml.bind:jaxb-impl:2.3.0")
diff --git a/spring-webmvc/spring-webmvc.gradle b/spring-webmvc/spring-webmvc.gradle
index 40974834fae..e94fa62a6cf 100644
--- a/spring-webmvc/spring-webmvc.gradle
+++ b/spring-webmvc/spring-webmvc.gradle
@@ -70,6 +70,7 @@ dependencies {
 		exclude group: "xom", module: "xom"
 		exclude group: "xerces", module: "xercesImpl"
 	}
+	testCompile("org.xmlunit:xmlunit-matchers:2.5.1")
 	testCompile("io.projectreactor:reactor-core")
 	testCompile("io.reactivex:rxjava:${rxjavaVersion}")
 	testCompile("io.reactivex:rxjava-reactive-streams:${rxjavaAdapterVersion}")