diff --git a/protractor.conf.js b/protractor.conf.js
index 6570c9f7c3..2949702a0a 100644
--- a/protractor.conf.js
+++ b/protractor.conf.js
@@ -5,7 +5,7 @@
 var SpecReporter = require('jasmine-spec-reporter').SpecReporter;
 
 exports.config = {
-  allScriptsTimeout: 600000,
+  allScriptsTimeout: 11000,
   // -----------------------------------------------------------------
   // Uncomment to run tests using a remote Selenium server
   //seleniumAddress: 'http://selenium.address:4444/wd/hub',
@@ -73,7 +73,7 @@ exports.config = {
   framework: 'jasmine',
   jasmineNodeOpts: {
     showColors: true,
-    defaultTimeoutInterval: 600000,
+    defaultTimeoutInterval: 30000,
     print: function () {}
   },
   useAllAngular2AppRoots: true,