diff --git a/web/pom.xml b/web/pom.xml
index 0d0ac0d977..7af5ce28ae 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -135,6 +135,12 @@
       <version>4.7</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.codehaus.groovy</groupId>
+      <artifactId>groovy</artifactId>
+      <version>2.0.5</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.easytesting</groupId>
       <artifactId>fest-assert</artifactId>
@@ -192,7 +198,7 @@
     <dependency>
       <groupId>org.spockframework</groupId>
       <artifactId>spock-core</artifactId>
-      <version>0.6-groovy-1.8</version>
+      <version>0.7-groovy-2.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/web/web.gradle b/web/web.gradle
index 69014574a6..bd70712124 100644
--- a/web/web.gradle
+++ b/web/web.gradle
@@ -1,8 +1,6 @@
 apply plugin: 'groovy'
 
 dependencies {
-    groovy 'org.codehaus.groovy:groovy:1.8.7'
-
     compile project(':spring-security-core'),
             'aopalliance:aopalliance:1.0',
             "org.springframework:spring-aop:$springVersion",
@@ -18,8 +16,9 @@ dependencies {
     testCompile project(':spring-security-core').sourceSets.test.output,
                 'commons-codec:commons-codec:1.3',
                 "org.slf4j:jcl-over-slf4j:$slf4jVersion",
-                'org.spockframework:spock-core:0.6-groovy-1.8',
+                "org.spockframework:spock-core:$spockVersion",
                 "org.springframework:spring-test:$springVersion",
+                "org.codehaus.groovy:groovy:$groovyVersion",
                 powerMockDependencies
 
     testRuntime "hsqldb:hsqldb:$hsqlVersion"