diff --git a/karma-e2e.conf.js b/karma-e2e.conf.js
index 3d839a33ae19..c1e066a8e9df 100644
--- a/karma-e2e.conf.js
+++ b/karma-e2e.conf.js
@@ -20,6 +20,8 @@ module.exports = function(config) {
     junitReporter: {
       outputFile: 'test_out/e2e.xml',
       suite: 'E2E'
-    }
+    },
+
+    browserNoActivityTimeout: 90000
   });
 };
diff --git a/karma-shared.conf.js b/karma-shared.conf.js
index f4b8cf93fdf0..b74b491004a8 100644
--- a/karma-shared.conf.js
+++ b/karma-shared.conf.js
@@ -7,6 +7,7 @@ module.exports = function(config, specificOptions) {
     browsers: ['Chrome'],
     browserDisconnectTimeout: 10000,
     browserDisconnectTolerance: 2,
+    browserNoActivityTimeout: 20000,
 
 
     // SauceLabs config for local development.