diff --git a/build.gradle.kts b/build.gradle.kts
index aa2b39b..eb79742 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -75,7 +75,8 @@ tasks {
         testLogging {
             events("passed", "skipped", "failed")
         }
-        systemProperty("junit.jupiter.execution.parallel.enabled", "true")
+        val parallellDisabled = System.getenv("CI" ) == "true"
+        systemProperty("junit.jupiter.execution.parallel.enabled", parallellDisabled.not().toString())
         systemProperty("junit.jupiter.execution.parallel.mode.default", "concurrent")
         systemProperty("junit.jupiter.execution.parallel.config.strategy", "fixed")
         systemProperty("junit.jupiter.execution.parallel.config.fixed.parallelism", "8")
diff --git a/src/test/kotlin/no/nav/helse/spokelse/AbstractE2ETest.kt b/src/test/kotlin/no/nav/helse/spokelse/AbstractE2ETest.kt
index 1e4fc7a..5604648 100644
--- a/src/test/kotlin/no/nav/helse/spokelse/AbstractE2ETest.kt
+++ b/src/test/kotlin/no/nav/helse/spokelse/AbstractE2ETest.kt
@@ -82,7 +82,7 @@ internal abstract class AbstractE2ETest {
         requestBody: String? = null,
         forventetHttpStatus: Int = 200,
         forventetResponseBody: String? = null,
-        timeout: Duration = Duration.ofSeconds(40),
+        timeout: Duration = Duration.ofSeconds(5),
         authorized: Boolean = true
     ) {
         naisfulTestApp(