diff --git a/dd-smoke-tests/gradle/build.gradle b/dd-smoke-tests/gradle/build.gradle
index a10d3f598e4..6030b1a66f2 100644
--- a/dd-smoke-tests/gradle/build.gradle
+++ b/dd-smoke-tests/gradle/build.gradle
@@ -24,8 +24,5 @@ test {
     // propagate proxy URL to tests, to then propagate it to nested Gradle builds
     environment "MAVEN_REPOSITORY_PROXY", project.property("mavenRepositoryProxy")
   }
-
-  // Overriding the default timeout as Gradle smoke tests might run for a longer duration.
-  timeout = Duration.of(20, ChronoUnit.MINUTES)
 }
 
diff --git a/gradle/configure_tests.gradle b/gradle/configure_tests.gradle
index 708b75b0698..2875fb0b2b8 100644
--- a/gradle/configure_tests.gradle
+++ b/gradle/configure_tests.gradle
@@ -75,8 +75,8 @@ tasks.withType(Test).configureEach {
     exclude("**/*ForkedTest*")
   }
 
-  // Set test timeout for 15 minutes. Default job timeout is 1h (configured on CI level).
-  timeout = Duration.of(15, ChronoUnit.MINUTES)
+  // Set test timeout for 20 minutes. Default job timeout is 1h (configured on CI level).
+  timeout = Duration.of(20, ChronoUnit.MINUTES)
 
   check.dependsOn(it)
 }