diff --git a/build.gradle b/build.gradle
index ba27d1f..b1b6c49 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,6 +22,7 @@ repositories {
 dependencies {
     compile gradleApi()
     compile localGroovy()
+    compile 'org.testng:testng:6.14.3'
 }
 
 task sourcesJar(type: Jar) {
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index b761216..e8c6bf7 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 fcd00e4..6482143 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Aug 22 20:02:41 CDT 2014
+#Wed Dec 19 17:14:16 EST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-bin.zip
diff --git a/gradlew b/gradlew
index 91a7e26..97fac78 100755
--- a/gradlew
+++ b/gradlew
@@ -42,11 +42,6 @@ case "`uname`" in
     ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
 # Attempt to set APP_HOME
 # Resolve links: $0 may be a link
 PRG="$0"
@@ -114,6 +109,7 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
diff --git a/src/main/groovy/us/kirchmeier/capsule/task/Capsule.groovy b/src/main/groovy/us/kirchmeier/capsule/task/Capsule.groovy
index 70e10bf..5745cd3 100644
--- a/src/main/groovy/us/kirchmeier/capsule/task/Capsule.groovy
+++ b/src/main/groovy/us/kirchmeier/capsule/task/Capsule.groovy
@@ -24,7 +24,7 @@ class Capsule extends Jar {
    * A filter, used to limit the capsule classes if the entire jar is not needed.
    * <p>The closure delegates to a {@link org.gradle.api.file.CopySpec}.</p>
    */
-  Closure capsuleFilter
+  Closure capsuleFilter = {}
 
   /**
    * The caplet configuration describing any caplet classes.
diff --git a/src/test/gradle/build.gradle b/src/test/gradle/build.gradle
index ad3d004..d73e223 100644
--- a/src/test/gradle/build.gradle
+++ b/src/test/gradle/build.gradle
@@ -91,9 +91,11 @@ project('subproject') {
   }
 }
 
-task runScript() << {
-  if(!project.hasProperty('testScript')) throw new Exception("Missing -PtestScript=...")
-  evaluate(new File(project.property('testScript')))
+task runScript() {
+  doLast {
+    if(!project.hasProperty('testScript')) throw new Exception("Missing -PtestScript=...")
+    evaluate(new File(project.property('testScript')))
+  }
 }
 
 def buildAllTask = task('buildAll')
diff --git a/src/test/gradle/gradle/wrapper/gradle-wrapper.properties b/src/test/gradle/gradle/wrapper/gradle-wrapper.properties
index ca6a538..c842f59 100644
--- a/src/test/gradle/gradle/wrapper/gradle-wrapper.properties
+++ b/src/test/gradle/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-bin.zip
diff --git a/src/test/gradle/subproject/build.gradle b/src/test/gradle/subproject/build.gradle
index c3dbe4f..3280621 100644
--- a/src/test/gradle/subproject/build.gradle
+++ b/src/test/gradle/subproject/build.gradle
@@ -1,3 +1,5 @@
-task hello << {
-  println "Hello, I am a subproject"
+task hello {
+  doLast {
+    println "Hello, I am a subproject"
+  }
 }
diff --git a/src/test/groovy/us/kirchmeier/capsule/manifest/CapsuleManifestTest.groovy b/src/test/groovy/us/kirchmeier/capsule/manifest/CapsuleManifestTest.groovy
index 9ea96d8..871f277 100644
--- a/src/test/groovy/us/kirchmeier/capsule/manifest/CapsuleManifestTest.groovy
+++ b/src/test/groovy/us/kirchmeier/capsule/manifest/CapsuleManifestTest.groovy
@@ -225,7 +225,7 @@ public class CapsuleManifestTest {
         'com.foo:Calculator-Adware:1.3:annoying(com.foo.optional:*) ' +
         'com.foo:Calculator-Ajax:1.1:standalone ' +
         'com.foo:Calculator-Core:1.0 ' +
-        'com.foo:Calculator-Mongo:1.2(com.bar:common,*:shared)'
+        'com.foo:Calculator-Mongo:1.2(*:shared,com.bar:common)'
 
     assert expectedDeps == result[null]['Dependencies']
   }
diff --git a/test.sh b/test.sh
index 65da8ea..a3cc291 100755
--- a/test.sh
+++ b/test.sh
@@ -8,17 +8,15 @@
 set -eu
 
 VERSIONS=(
-  2.14.1
-  2.13
-  2.12
-  2.11
-  2.10
-  2.9
-  2.8
-  2.7
-  2.6
-  2.5
-  2.4
+    5.0
+    4.10
+    4.9
+    4.8
+    4.7
+    4.6
+    4.5
+    4.4
+    4.3
 )
 
 main(){
@@ -56,4 +54,4 @@ write_wrapper_props_file(){
     > gradle/wrapper/gradle-wrapper.properties
 }
 
-main
\ No newline at end of file
+main