2 files changed, 6 insertions, 2 deletions

diff --git a/gradle/java-common.gradle b/gradle/java-common.gradle
index 0cc09a4f..8a267e6f 100644
--- a/gradle/java-common.gradle
+++ b/gradle/java-common.gradle
@@ -27,6 +27,10 @@ jar {
         }
 }
 
+test {
+        useJUnitPlatform()
+}
+
 clean.doLast {
         delete 'src/main/xtend-gen'
         delete 'src/test/xtend-gen'
diff --git a/gradle/xtext-common.gradle b/gradle/xtext-common.gradle
index cf6a5831..7fb2b2b5 100644
--- a/gradle/xtext-common.gradle
+++ b/gradle/xtext-common.gradle
@@ -10,8 +10,8 @@ sourceSets {
                 resources.srcDirs += ['src/main/xtext-gen']
         }
         test {
-                java.srcDirs = ['src/test/xtext-gen']
-                resources.srcDirs = ['src/test/xtext-gen']
+                java.srcDirs += ['src/test/xtext-gen']
+                resources.srcDirs += ['src/test/xtext-gen']
         }
 }