diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 6945465640..bd22a2bf0d 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -276,7 +276,7 @@ tasks {
     withType<Test> {
         useJUnitPlatform()
         maxHeapSize = "4g"
-        jvmArgs = listOf("-XX:MaxMetaspaceSize=512m")
+        maxParallelForks = Runtime.getRuntime().availableProcessors()
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
index d8d780060b..aa85f46f01 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,3 +6,4 @@ android.useAndroidX=true
 kotlin.code.style=official
 
 org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
+org.gradle.parallel=true