diff --git a/gradle-plugins/compose/build.gradle.kts b/gradle-plugins/compose/build.gradle.kts
index f32187540e..cd5b66d507 100644
--- a/gradle-plugins/compose/build.gradle.kts
+++ b/gradle-plugins/compose/build.gradle.kts
@@ -118,6 +118,15 @@ tasks.test {
     }
 }
 
+if (properties.getOrDefault("dev.junit.parallel", "false") == "true") {
+    logger.lifecycle("Test task will run in parallel")
+    tasks.withType(Test::class.java) {
+        //https://junit.org/junit5/docs/current/user-guide/#writing-tests-parallel-execution-config-properties
+        systemProperties["junit.jupiter.execution.parallel.enabled"] = true
+        systemProperties["junit.jupiter.execution.parallel.mode.default"] = "concurrent"
+    }
+}
+
 /**
  * Gradle 8.0 removed auto downloading of requested toolchains unless a toolchain repository is configured.
  * For now, the only option to enable auto downloading out-of-the-box is to use Foojay Disco resolver,
diff --git a/gradle-plugins/gradle.properties b/gradle-plugins/gradle.properties
index dd9ac4a39c..55f8591ccc 100644
--- a/gradle-plugins/gradle.properties
+++ b/gradle-plugins/gradle.properties
@@ -1,8 +1,12 @@
 org.gradle.parallel=true
 org.gradle.configuration-cache=true
 org.gradle.caching=true
+org.gradle.daemon=true
 kotlin.code.style=official
 
+# CI agents don't have enough resources to support it :(
+dev.junit.parallel=false
+
 # Default version of Compose Libraries used by Gradle plugin
 compose.version=1.6.0-dev1383
 # The latest version of Compose Compiler used by Gradle plugin. Used only in tests/CI.