diff --git a/build.gradle b/build.gradle
index 4608808..107d206 100755
--- a/build.gradle
+++ b/build.gradle
@@ -81,7 +81,7 @@ subprojects {
         }
 
         dependencies {
-            groovy groovyDependency
+            compile groovyDependency
             testCompile spockDependency
         }
 
@@ -179,7 +179,7 @@ project(':module:remote-using-lib') {
     apply plugin: "groovy"
 
     dependencies {
-        groovy groovyDependency
+        compile groovyDependency
         compile project(":module:remote-core")
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0161560..aaef3f5 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-bin.zip
diff --git a/module/remote-core/src/test/groovy/io/remotecontrol/client/InnerClosureClassDefinitionsFinderSpec.groovy b/module/remote-core/src/test/groovy/io/remotecontrol/client/InnerClosureClassDefinitionsFinderSpec.groovy
index 16c10b5..4e5723c 100644
--- a/module/remote-core/src/test/groovy/io/remotecontrol/client/InnerClosureClassDefinitionsFinderSpec.groovy
+++ b/module/remote-core/src/test/groovy/io/remotecontrol/client/InnerClosureClassDefinitionsFinderSpec.groovy
@@ -16,34 +16,34 @@
 package io.remotecontrol.client
 
 import io.remotecontrol.groovy.client.InnerClosureClassDefinitionsFinder
-import spock.lang.*
+import spock.lang.Specification
 
 class InnerClosureClassDefinitionsFinderSpec extends Specification {
 
-	protected createFinder(String[] urls) {
-		new InnerClosureClassDefinitionsFinder(new URLClassLoader(urls.collect { new URL(it) } as URL[]))
-	}
-	
-	def "non existant class path entries are ignored"() {
-		given:
-		def finder = createFinder("file:///idontexist.zip", "file:///idontexistdirectory")
-		
-		when:
-		finder.find({ 1 }.class)
-		
-		then:
-		notThrown Exception
-	}
-	
-	def "non file classpath entries are ignored"() {
-		given:
-		def finder = createFinder("http://google.com")
-		
-		when:
-		finder.find({ 1 }.class)
-		
-		then:
-		notThrown Exception
-	}
-	
+    protected createFinder(String[] urls) {
+        new InnerClosureClassDefinitionsFinder(new URLClassLoader(urls.collect { new URL(it) } as URL[]))
+    }
+
+    def "non existant class path entries are ignored"() {
+        given:
+        def finder = createFinder("file:///idontexist.zip", "file:///idontexistdirectory")
+
+        when:
+        finder.find({ 1 }.class)
+
+        then:
+        notThrown Exception
+    }
+
+    def "non file classpath entries are ignored"() {
+        given:
+        def finder = createFinder("http://google.com")
+
+        when:
+        finder.find({ 1 }.class)
+
+        then:
+        notThrown Exception
+    }
+
 }
diff --git a/module/remote-core/src/test/groovy/io/remotecontrol/test/SmokeTests.groovy b/module/remote-core/src/test/groovy/io/remotecontrol/test/SmokeTests.groovy
index 2e348d0..5578902 100644
--- a/module/remote-core/src/test/groovy/io/remotecontrol/test/SmokeTests.groovy
+++ b/module/remote-core/src/test/groovy/io/remotecontrol/test/SmokeTests.groovy
@@ -268,6 +268,7 @@ class SmokeTests extends GroovyTestCase {
     /**
      * Variation of above, but yields a different error.
      */
+    @SuppressWarnings("EmptyClass")
     static class Inner {}
 
     void testCannotInstantiateClassesNotInTheApp() {