diff --git a/spring-beans/spring-beans.gradle b/spring-beans/spring-beans.gradle
index b8ead1ac61..e60972f9ad 100644
--- a/spring-beans/spring-beans.gradle
+++ b/spring-beans/spring-beans.gradle
@@ -6,7 +6,7 @@ dependencies {
 	compile(project(':spring-core'))
 	optional("javax.inject:javax.inject:1")
 	optional("org.yaml:snakeyaml:1.21")
-    optional("org.codehaus.groovy:groovy-all:${groovyVersion}")
+	optional("org.codehaus.groovy:groovy-xml:${groovyVersion}")
 	optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
 	optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
 	testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
diff --git a/spring-context/spring-context.gradle b/spring-context/spring-context.gradle
index 825953a1b7..ac6dec562e 100644
--- a/spring-context/spring-context.gradle
+++ b/spring-context/spring-context.gradle
@@ -17,12 +17,15 @@ dependencies {
 	optional("javax.validation:validation-api:1.1.0.Final")
 	optional("javax.xml.ws:jaxws-api:2.3.0")
 	optional("org.aspectj:aspectjweaver:${aspectjVersion}")
-	optional("org.codehaus.groovy:groovy-all:${groovyVersion}")
+	optional("org.codehaus.groovy:groovy:${groovyVersion}")
 	optional("org.beanshell:bsh:2.0b5")
 	optional("joda-time:joda-time:2.10")
 	optional("org.hibernate:hibernate-validator:5.4.2.Final")
 	optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
 	optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
+	testCompile("org.codehaus.groovy:groovy-xml:${groovyVersion}")
+	testCompile("org.codehaus.groovy:groovy-jsr223:${groovyVersion}")
+	testCompile("org.codehaus.groovy:groovy-test:${groovyVersion}")
 	testCompile("org.apache.commons:commons-pool2:2.5.0")
 	testCompile("javax.inject:javax.inject-tck:1")
 	testRuntime("javax.xml.bind:jaxb-api:2.3.0")