diff --git a/build.gradle.kts b/build.gradle.kts
index 74a72e4f..2b83d7d5 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -99,15 +99,15 @@ tasks.withType<KotlinCompile> {
     }
 }
 
-tasks.withType<Test>().configureEach {
-    maxParallelForks = 1
-    forkEvery = 100
+tasks.withType<Test> {
+    useJUnitPlatform()
 
-    maxHeapSize = "1024m"
+    val springContextCacheMaxSize = (project.findProperty("test.springContextCacheMaxSize") as String?) ?: "1"
+    maxHeapSize = (project.findProperty("testMaxHeap") as String?) ?: "1536m"
 
     jvmArgs(
-        "-XX:MaxMetaspaceSize=512m",
-        "-Dfile.encoding=UTF-8"
+        "-Dfile.encoding=UTF-8",
+        "-Dspring.test.context.cache.maxSize=$springContextCacheMaxSize"
     )
 }