diff --git a/gradle.properties b/gradle.properties
index 8e3c532..c61692a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,2 @@
-org.gradle.daemon=true
 LIVINGDOC_VERSION = 1.4-SNAPSHOT
-LIVINGDOC_GRADLE_VERSION = 1.4-SNAPSHOT
\ No newline at end of file
+LIVINGDOC_GRADLE_VERSION = 1.4-SNAPSHOT
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index d3b8398..9780b0c 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d12dad8..d57d085 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Jun 10 11:22:14 CEST 2016
+#Fri Jan 20 14:30:50 CET 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip
diff --git a/gradlew b/gradlew
index 69f0585..6bf108f 100755
--- a/gradlew
+++ b/gradlew
@@ -161,11 +161,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save ( ) {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index f6d5974..e95643d 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -49,7 +49,6 @@ goto fail
 @rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line
diff --git a/livingdoc-gradle.gradle b/livingdoc-gradle.gradle
index a9cdc2b..4825868 100644
--- a/livingdoc-gradle.gradle
+++ b/livingdoc-gradle.gradle
@@ -15,7 +15,11 @@ repositories {
 configurations.all {
   transitive = false
 }
-  
+
+test {
+  useTestNG()
+}
+
 dependencies {
   compile gradleApi()
   compile localGroovy()
@@ -32,4 +36,13 @@ dependencies {
   testCompile('org.spockframework:spock-core:1.0-groovy-2.4') {
     exclude module: 'groovy-all'
   }
-}
\ No newline at end of file
+}
+
+afterEvaluate { 
+  tasks.withType(org.gradle.api.tasks.compile.GroovyCompile) { 
+    options.compilerArgs = [ 
+            "-Xbootclasspath/p:" + configurations.compile.asPath 
+    ] 
+  } 
+}
+
diff --git a/src/test/groovy/info/novatec/testit/livingdoc/plugins/LivingDocPluginTest.groovy b/src/test/groovy/info/novatec/testit/livingdoc/plugins/LivingDocPluginTest.groovy
index d1fe90a..7be2f14 100644
--- a/src/test/groovy/info/novatec/testit/livingdoc/plugins/LivingDocPluginTest.groovy
+++ b/src/test/groovy/info/novatec/testit/livingdoc/plugins/LivingDocPluginTest.groovy
@@ -2,7 +2,6 @@ package info.novatec.testit.livingdoc.plugins
 
 import spock.lang.*
 import org.gradle.api.*
-import org.gradle.api.plugins.*
 import org.gradle.testfixtures.ProjectBuilder
 
 /**
@@ -46,7 +45,7 @@ class LivingDocPluginTest extends Specification {
         then:
         project.sourceSets.size() == 5
         project.tasks.findAll {
-            it.name.startsWith(project.LIVINGDOC_SOURCESET_NAME) &&  !it.name.startsWith('freeze')
+            it.name.startsWith(project.LIVINGDOC_SOURCESET_NAME) && !it.name.startsWith('freeze')
         }.size() == 3
         project.sourceSets.findAll { it.name.startsWith(project.LIVINGDOC_SOURCESET_NAME) }.size() == 3
     }