diff --git a/dd-java-agent/src/test/groovy/datadog/trace/agent/AgentLoadedIntoBootstrapTest.groovy b/dd-java-agent/src/test/groovy/datadog/trace/agent/AgentLoadedIntoBootstrapTest.groovy
index a3d8d48181..91ee6bae91 100644
--- a/dd-java-agent/src/test/groovy/datadog/trace/agent/AgentLoadedIntoBootstrapTest.groovy
+++ b/dd-java-agent/src/test/groovy/datadog/trace/agent/AgentLoadedIntoBootstrapTest.groovy
@@ -3,7 +3,9 @@ package datadog.trace.agent
 import datadog.trace.agent.test.IntegrationTestUtils
 import jvmbootstraptest.AgentLoadedChecker
 import spock.lang.Specification
+import spock.lang.Timeout
 
+@Timeout(30)
 class AgentLoadedIntoBootstrapTest extends Specification {
 
   def "Agent loads in when separate jvm is launched"() {
diff --git a/dd-java-agent/src/test/groovy/datadog/trace/agent/CustomLogManagerTest.groovy b/dd-java-agent/src/test/groovy/datadog/trace/agent/CustomLogManagerTest.groovy
index ca1f0be952..665e780b94 100644
--- a/dd-java-agent/src/test/groovy/datadog/trace/agent/CustomLogManagerTest.groovy
+++ b/dd-java-agent/src/test/groovy/datadog/trace/agent/CustomLogManagerTest.groovy
@@ -4,7 +4,9 @@ import datadog.trace.agent.test.IntegrationTestUtils
 import jvmbootstraptest.LogManagerSetter
 import spock.lang.Requires
 import spock.lang.Specification
+import spock.lang.Timeout
 
+@Timeout(30)
 // Note: this test is fails on IBM JVM, we would need to investigate this at some point
 @Requires({ !System.getProperty("java.vm.name").contains("IBM J9 VM") })
 class CustomLogManagerTest extends Specification {
diff --git a/dd-java-agent/src/test/groovy/datadog/trace/agent/JMXFetchTest.groovy b/dd-java-agent/src/test/groovy/datadog/trace/agent/JMXFetchTest.groovy
index de5ac7369c..d74195174c 100644
--- a/dd-java-agent/src/test/groovy/datadog/trace/agent/JMXFetchTest.groovy
+++ b/dd-java-agent/src/test/groovy/datadog/trace/agent/JMXFetchTest.groovy
@@ -6,9 +6,11 @@ import jvmbootstraptest.AgentLoadedChecker
 import org.junit.Rule
 import org.junit.contrib.java.lang.system.RestoreSystemProperties
 import spock.lang.Specification
+import spock.lang.Timeout
 
 import java.lang.reflect.Method
 
+@Timeout(30)
 class JMXFetchTest extends Specification {
 
   @Rule
diff --git a/dd-java-agent/src/test/groovy/datadog/trace/agent/LogLevelTest.groovy b/dd-java-agent/src/test/groovy/datadog/trace/agent/LogLevelTest.groovy
index 22d415e43e..5bd2b47b7e 100644
--- a/dd-java-agent/src/test/groovy/datadog/trace/agent/LogLevelTest.groovy
+++ b/dd-java-agent/src/test/groovy/datadog/trace/agent/LogLevelTest.groovy
@@ -1,11 +1,11 @@
 package datadog.trace.agent
 
 import datadog.trace.agent.test.IntegrationTestUtils
-
 import jvmbootstraptest.LogLevelChecker
 import spock.lang.Specification
+import spock.lang.Timeout
 
-
+@Timeout(30)
 class LogLevelTest extends Specification {
 
 
@@ -17,23 +17,25 @@ class LogLevelTest extends Specification {
   def "dd.trace.debug false"() {
     expect:
     IntegrationTestUtils.runOnSeparateJvm(LogLevelChecker.getName()
-      , ["-Ddd.trace.debug=false","-Ddd.jmxfetch.enabled=false","-Ddd.trace.enabled=false"] as String[]
+      , ["-Ddd.trace.debug=false", "-Ddd.jmxfetch.enabled=false", "-Ddd.trace.enabled=false"] as String[]
       , "" as String[]
       , [:]
       , true) == 1
   }
+
   def "SLF4J DEBUG &&  dd.trace.debug is false"() {
     expect:
     IntegrationTestUtils.runOnSeparateJvm(LogLevelChecker.getName()
-      , ["-Ddd.trace.debug=false","-Ddatadog.slf4j.simpleLogger.defaultLogLevel=debug","-Ddd.jmxfetch.enabled=false","-Ddd.trace.enabled=false"] as String[]
+      , ["-Ddd.trace.debug=false", "-Ddatadog.slf4j.simpleLogger.defaultLogLevel=debug", "-Ddd.jmxfetch.enabled=false", "-Ddd.trace.enabled=false"] as String[]
       , "" as String[]
       , [:]
       , true) == 0
   }
+
   def "dd.trace.debug is false && DD_TRACE_DEBUG is true"() {
     expect:
     IntegrationTestUtils.runOnSeparateJvm(LogLevelChecker.getName()
-      , ["-Ddd.trace.debug=false","-Ddd.jmxfetch.enabled=false","-Ddd.trace.enabled=false"] as String[]
+      , ["-Ddd.trace.debug=false", "-Ddd.jmxfetch.enabled=false", "-Ddd.trace.enabled=false"] as String[]
       , "" as String[]
       , ["DD_TRACE_DEBUG": "true"]
       , true) == 1
@@ -42,7 +44,7 @@ class LogLevelTest extends Specification {
   def "dd.trace.debug is true"() {
     expect:
     IntegrationTestUtils.runOnSeparateJvm(LogLevelChecker.getName()
-      , ["-Ddd.trace.debug=true","-Ddd.jmxfetch.enabled=false","-Ddd.trace.enabled=false"] as String[]
+      , ["-Ddd.trace.debug=true", "-Ddd.jmxfetch.enabled=false", "-Ddd.trace.enabled=false"] as String[]
       , "" as String[]
       , [:]
       , true) == 0
@@ -52,7 +54,7 @@ class LogLevelTest extends Specification {
   def "DD_TRACE_DEBUG is true"() {
     expect:
     IntegrationTestUtils.runOnSeparateJvm(LogLevelChecker.getName()
-      , ["-Ddd.jmxfetch.enabled=false","-Ddd.trace.enabled=false"] as String[]
+      , ["-Ddd.jmxfetch.enabled=false", "-Ddd.trace.enabled=false"] as String[]
       , "" as String[]
       , ["DD_TRACE_DEBUG": "true"]
       , true) == 0
@@ -61,18 +63,17 @@ class LogLevelTest extends Specification {
   def "dd.trace.debug is true && DD_TRACE_DEBUG is false"() {
     expect:
     IntegrationTestUtils.runOnSeparateJvm(LogLevelChecker.getName()
-      , ["-Ddd.trace.debug=true","-Ddd.jmxfetch.enabled=false","-Ddd.trace.enabled=false"] as String[]
+      , ["-Ddd.trace.debug=true", "-Ddd.jmxfetch.enabled=false", "-Ddd.trace.enabled=false"] as String[]
       , "" as String[]
       , ["DD_TRACE_DEBUG": "false"]
       , true) == 0
   }
 
 
-
   def "SLF4J DEBUG && DD_TRACE_DEBUG is false"() {
     expect:
     IntegrationTestUtils.runOnSeparateJvm(LogLevelChecker.getName()
-      , ["-Ddatadog.slf4j.simpleLogger.defaultLogLevel=debug","-Ddd.jmxfetch.enabled=false","-Ddd.trace.enabled=false"] as String[]
+      , ["-Ddatadog.slf4j.simpleLogger.defaultLogLevel=debug", "-Ddd.jmxfetch.enabled=false", "-Ddd.trace.enabled=false"] as String[]
       , "" as String[]
       , ["DD_TRACE_DEBUG": "false"]
       , true) == 0
@@ -81,7 +82,7 @@ class LogLevelTest extends Specification {
   def "SLF4J INFO && DD_TRACE_DEBUG is true"() {
     expect:
     IntegrationTestUtils.runOnSeparateJvm(LogLevelChecker.getName()
-      , ["-Ddatadog.slf4j.simpleLogger.defaultLogLevel=info","-Ddd.jmxfetch.enabled=false","-Ddd.trace.enabled=false"] as String[]
+      , ["-Ddatadog.slf4j.simpleLogger.defaultLogLevel=info", "-Ddd.jmxfetch.enabled=false", "-Ddd.trace.enabled=false"] as String[]
       , "" as String[]
       , ["DD_TRACE_DEBUG": "true"]
       , true) == 1
diff --git a/gradle/java.gradle b/gradle/java.gradle
index 22c8dcb7c2..c5d3f1c40b 100644
--- a/gradle/java.gradle
+++ b/gradle/java.gradle
@@ -332,8 +332,8 @@ for (def env : System.getenv().entrySet()) {
 }
 
 tasks.withType(Test).configureEach {
-  // All tests must complete within 2 minutes.
-  timeout = Duration.ofMinutes(2)
+  // All tests must complete within 3 minutes.
+  timeout = Duration.ofMinutes(3)
 
   // Disable all tests if skipTests property was specified
   onlyIf { !project.rootProject.hasProperty("skipTests") }