diff --git a/lib/runner/cli/nightwatch.conf.ejs b/lib/runner/cli/nightwatch.conf.ejs
index 59e6880ed1..c90f45c094 100644
--- a/lib/runner/cli/nightwatch.conf.ejs
+++ b/lib/runner/cli/nightwatch.conf.ejs
@@ -195,7 +195,7 @@ module.exports = {
       disable_error_log: true,
       webdriver: {
         timeout_options: {
-          timeout: 15000,
+          timeout: 60000,
           retry_attempts: 3
         },
         keep_alive: true,
diff --git a/test/src/cli/testCliRunnerGenerate.js b/test/src/cli/testCliRunnerGenerate.js
index 7870d20001..cfa21acae0 100644
--- a/test/src/cli/testCliRunnerGenerate.js
+++ b/test/src/cli/testCliRunnerGenerate.js
@@ -131,7 +131,7 @@ describe('Test CLI Runner Generate', function() {
           disable_error_log: true,
           webdriver: {
             timeout_options: {
-              timeout: 15000,
+              timeout: 60000,
               retry_attempts: 3
             },
             keep_alive: true,