diff --git a/.circleci/config.yml b/.circleci/config.yml
index 95e6780d..b56509ac 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -38,5 +38,5 @@ jobs:
             - ~/.gradle
           key: v1-dependencies-{{ checksum "build.gradle" }}
 
-      # run tests!
-      - run: ./gradlew test
\ No newline at end of file
+      # run build!
+      - run: ./gradlew build
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 5cb1cfd2..2ad5e332 100644
--- a/build.gradle
+++ b/build.gradle
@@ -62,11 +62,6 @@ configurations {
 }
 
 sourceSets {
-    unitTests {
-        compileClasspath += main.output + test.output
-        runtimeClasspath += main.output + test.output
-        java.srcDir file('src/test/java')
-    }
     integrationTests {
         compileClasspath += main.output + test.output
         runtimeClasspath += main.output + test.output
@@ -75,22 +70,22 @@ sourceSets {
     }
 }
 
-task unitTest(type: Test) {
-    testClassesDirs = sourceSets.unitTests.output.classesDirs
-    classpath = sourceSets.unitTests.runtimeClasspath
-    testLogging {
-        events "passed", "skipped", "failed"
-    }
+test.testLogging {
+    events "passed", "skipped", "failed"
 }
 
-task integrationTest(type: Test) {
+task integrationTest(type: Test, group: 'verification') {
     testClassesDirs= sourceSets.integrationTests.output.classesDirs
     classpath = sourceSets.integrationTests.runtimeClasspath
     testLogging {
         events "passed", "skipped", "failed"
     }
+
+    mustRunAfter test
 }
 
+check.dependsOn integrationTest
+
 //
 // Deploying releases to Maven Central (or snapshots to a local Nexus repository).
 //