1 files changed, 11 insertions, 2 deletions
diff --git a/packages/taler-harness/src/integrationtests/testrunner.ts b/packages/taler-harness/src/integrationtests/testrunner.ts
index e35264d13..67572f0f7 100644
--- a/packages/taler-harness/src/integrationtests/testrunner.ts
+++ b/packages/taler-harness/src/integrationtests/testrunner.ts
@@ -338,8 +338,17 @@ export async function runTests(spec: TestRunSpec) {
     currentChild.stdout?.pipe(harnessLogStream);
     currentChild.stderr?.pipe(harnessLogStream);
 
-    const defaultTimeout = 60000;
-    const testTimeoutMs = testCase.timeoutMs ?? defaultTimeout;
+    // Default timeout when the test doesn't override it.
+    let defaultTimeout = 60000;
+    const overrideDefaultTimeout = process.env.TALER_TEST_TIMEOUT;
+    if (overrideDefaultTimeout) {
+      defaultTimeout = Number.parseInt(overrideDefaultTimeout, 10) * 1000;
+    }
+
+    // Set the timeout to at least be the default timeout.
+    const testTimeoutMs = testCase.timeoutMs
+      ? Math.max(testCase.timeoutMs, defaultTimeout)
+      : defaultTimeout;
 
     if (spec.noTimeout) {
       console.log(`running ${testName}, no timeout`);