diff --git a/build.gradle b/build.gradle
index d86448ebe2a..679ec9f33bb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -168,7 +168,7 @@ rootProject.ext.versions = [
   apacheAnt             : '1.10.7',
   apacheHttpComponents  : '4.5.6',
   aspectj               : '1.9.5',
-  assertJ               : '3.15.0',
+  assertJ               : '3.12.2',
   bouncyCastle          : '1.59', // bouncycastle version has to be compatible with the jruby version
   bundler               : '2.1.1',
   cglib                 : '3.3.0',
@@ -236,10 +236,7 @@ rootProject.ext.versions = [
   tokenBucket           : '1.7',
   urlrewrite            : '3.2.0',
   velocityToolsView     : '1.4',
-  velocityToolsView     : '1.4',
-  xmlUnitMatchers       : '2.6.3',
-  xmlUnitMatchers       : '2.6.3',
-  xmlunitassertj        : '2.6.3',
+  xmlUnit               : '2.6.3',
   seleniumDrivers       : [
     chromedriver  : '2.41',
     geckodriver   : '0.21.0',
diff --git a/config/config-server/build.gradle b/config/config-server/build.gradle
index 8bee8ce72c3..5a11d7b4526 100644
--- a/config/config-server/build.gradle
+++ b/config/config-server/build.gradle
@@ -35,7 +35,7 @@ dependencies {
   testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: project.versions.junit5
   testCompile group: 'org.junit.jupiter', name: 'junit-jupiter-migrationsupport', version: project.versions.junit5
   testCompile group: 'org.assertj', name: 'assertj-core', version: project.versions.assertJ
-  testCompile group: 'org.xmlunit', name: 'xmlunit-assertj', version: project.versions.xmlunitassertj
+  testCompile group: 'org.xmlunit', name: 'xmlunit-assertj', version: project.versions.xmlUnit
 
 }
 
diff --git a/server/build.gradle b/server/build.gradle
index 46e078013c3..a32210ff884 100644
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -331,9 +331,9 @@ dependencies {
   testCompile project(':jetty9')
   testCompile group: 'net.javacrumbs.json-unit', name: 'json-unit-fluent', version: project.versions.jsonUnit
   testCompile group: 'org.jsoup', name: 'jsoup', version: project.versions.jsoup
-  testCompile group: 'org.xmlunit', name: 'xmlunit-matchers', version: project.versions.xmlUnitMatchers
+  testCompile group: 'org.xmlunit', name: 'xmlunit-matchers', version: project.versions.xmlUnit
   testCompile group: 'org.assertj', name: 'assertj-core', version: project.versions.assertJ
-  testCompile group: 'org.xmlunit', name: 'xmlunit-assertj', version: project.versions.xmlunitassertj
+  testCompile group: 'org.xmlunit', name: 'xmlunit-assertj', version: project.versions.xmlUnit
 
   testCompile project(':test:http-mocks')