diff --git a/scripts/gulpfiles/test_tasks.js b/scripts/gulpfiles/test_tasks.js
index c4e19d606..b26e23084 100644
--- a/scripts/gulpfiles/test_tasks.js
+++ b/scripts/gulpfiles/test_tasks.js
@@ -299,7 +299,7 @@ async function generators() {
     rimraf.sync(OUTPUT_DIR);
     fs.mkdirSync(OUTPUT_DIR);
 
-    await runGeneratorsInBrowser(OUTPUT_DIR).catch(() => {});
+    await runGeneratorsInBrowser(OUTPUT_DIR);
 
     const generatorSuffixes = ['js', 'py', 'dart', 'lua', 'php'];
     let failed = 0;
diff --git a/tests/generators/webdriver.js b/tests/generators/webdriver.js
index 202850746..a422323ec 100644
--- a/tests/generators/webdriver.js
+++ b/tests/generators/webdriver.js
@@ -66,6 +66,10 @@ async function runGeneratorsInBrowser(outputDir) {
 
   console.log('Starting webdriverio...');
   const browser = await webdriverio.remote(options);
+
+  // Increase the script timeouts to 2 minutes to allow the generators to finish.
+  await browser.setTimeout({ 'script': 120000 })
+
   console.log('Loading url: ' + url);
   await browser.url(url);