diff --git a/core/cache/build.gradle b/core/cache/build.gradle
index 5c273b70..4f9d6446 100644
--- a/core/cache/build.gradle
+++ b/core/cache/build.gradle
@@ -4,7 +4,6 @@ dependencies {
     api project(':core:domain')
     api other.twitterSerial
 
-    testImplementation testing.junit
     testImplementation testing.kotlinJunit
     testImplementation testing.mockito
     testImplementation testing.mockitoInline
diff --git a/core/subsonic-api/build.gradle b/core/subsonic-api/build.gradle
index 45b205a1..2e4582fe 100644
--- a/core/subsonic-api/build.gradle
+++ b/core/subsonic-api/build.gradle
@@ -11,7 +11,6 @@ dependencies {
     implementation other.kotlinReflect // for jackson kotlin, but to use the same version
     implementation other.okhttpLogging
 
-    testImplementation testing.junit
     testImplementation testing.kotlinJunit
     testImplementation testing.mockito
     testImplementation testing.mockitoInline
diff --git a/dependencies.gradle b/dependencies.gradle
index 71c1ae10..576c0019 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -22,7 +22,8 @@ ext.versions = [
         koin                 : "1.0.0-beta-3",
         picasso              : "2.71828",
 
-        junit                : "4.12",
+        junit4               : "4.12",
+        junit5               : "5.3.1",
         mockito              : "2.16.0",
         mockitoKotlin        : "1.5.0",
         kluent               : "1.35",
@@ -62,7 +63,8 @@ ext.other = [
 ]
 
 ext.testing = [
-        junit         : "junit:junit:$versions.junit",
+        junit         : "junit:junit:$versions.junit4",
+        junitVintage  : "org.junit.vintage:junit-vintage-engine:$versions.junit5",
         kotlinJunit   : "org.jetbrains.kotlin:kotlin-test-junit:$versions.kotlin",
         mockitoKotlin : "com.nhaarman:mockito-kotlin:$versions.mockitoKotlin",
         mockito       : "org.mockito:mockito-core:$versions.mockito",
diff --git a/gradle_scripts/kotlin-module-bootstrap.gradle b/gradle_scripts/kotlin-module-bootstrap.gradle
index 3917db62..f95fbc80 100644
--- a/gradle_scripts/kotlin-module-bootstrap.gradle
+++ b/gradle_scripts/kotlin-module-bootstrap.gradle
@@ -13,8 +13,15 @@ sourceSets {
     test.resources.srcDirs += "${projectDir}/src/integrationTest/resources"
 }
 
+test {
+    useJUnitPlatform()
+}
+
 dependencies {
     api other.kotlinStdlib
+
+    testImplementation testing.junit
+    testRuntimeOnly testing.junitVintage
 }
 
 jacoco {