diff --git a/build.gradle b/build.gradle
index 02e6ed72ab9a878686cf417481c4b2e2ad8e9d34..9f069957c5df522ccadecfe0cae5fd3ef62af303 100644
--- a/build.gradle
+++ b/build.gradle
@@ -36,37 +36,37 @@ dependencies {
   implementation "io.micronaut:micronaut-validation"
   implementation "io.micronaut:micronaut-runtime"
   implementation "io.micronaut:micronaut-http-server-netty"
-  runtimeOnly "ch.qos.logback:logback-classic:1.2.3"
   implementation "com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.0"
+  runtimeOnly "ch.qos.logback:logback-classic:1.2.3"
 
   // junit
+  testAnnotationProcessor "io.micronaut:micronaut-inject-java:1.2.6"
+  testImplementation platform("io.micronaut:micronaut-bom:1.2.6")
   testImplementation "org.junit.jupiter:junit-jupiter:5.5.2"
-  testImplementation "org.junit.jupiter:junit-jupiter-api:5.4.2"
-  testImplementation "org.mockito:mockito-junit-jupiter:2.22.0"
-  // testAnnotationProcessor "io.micronaut:micronaut-inject-java:1.2.6"
-  // testImplementation "io.micronaut.test:micronaut-test-junit5:1.1.2"
-  // testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.1.0"
+  testImplementation "org.junit.jupiter:junit-jupiter-api"
+  testImplementation "io.micronaut.test:micronaut-test-junit5"
+  testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
 }
 
 sourceSets {
   main {
     java {
-      srcDirs = ["src"]
+      srcDirs = ["src/java"]
     }
 
     resources {
-      srcDirs = ["src", "src/resources"]
+      srcDirs = ["src/resources"]
       exclude "**/*.java"
     }
   }
 
   test {
     java {
-      srcDirs = ["test"]
+      srcDirs = ["test/java"]
     }
 
     resources {
-      srcDirs = ["test"]
+      srcDirs = ["test/java"]
       exclude "**/*.java"
     }
   }
@@ -75,7 +75,7 @@ sourceSets {
 task faultSections(type: Sync) {
   from "../nshm-fault-sections"
   include "**/*.geojson"
-  into "${buildDir}/resources/main/resources/fault-data"
+  into "${buildDir}/resources/main/fault"
 }
 
 test {
@@ -103,7 +103,7 @@ shadowJar {
     main {
       java {
         resources {
-          exclude "fault-data"
+          exclude "fault"
         }
       }
     }