diff --git a/test/functional/apps/discover/_discover.js b/test/functional/apps/discover/_discover.js
index 44320025b7a1..2e366c27b5f4 100644
--- a/test/functional/apps/discover/_discover.js
+++ b/test/functional/apps/discover/_discover.js
@@ -12,7 +12,6 @@ define(function (require) {
       var settingsPage;
       var discoverPage;
       var remote;
-      this.timeout = 60000;
 
       bdd.before(function () {
         common = new Common(this.remote);
@@ -71,7 +70,6 @@ define(function (require) {
 
         bdd.it('save query should show toast message and display query name', function () {
           var expectedSavedQueryMessage = 'Discover: Saved Data Source "' + queryName1 + '"';
-          this.timeout = 60000;
           return discoverPage.saveSearch(queryName1)
           .then(function () {
             return headerPage.getToastMessage();
diff --git a/test/functional/apps/discover/index.js b/test/functional/apps/discover/index.js
index 2e1df80ac7ca..9b0bfb7109e7 100644
--- a/test/functional/apps/discover/index.js
+++ b/test/functional/apps/discover/index.js
@@ -19,6 +19,7 @@ define(function (require) {
     bdd.before(function () {
       common = new Common(this.remote);
       remote = this.remote;
+      this.timeout = 120000;
     });
 
     bdd.after(function unloadMakelogs() {
diff --git a/test/intern.js b/test/intern.js
index a1f3ec28e0f4..913d3ec11f8c 100644
--- a/test/intern.js
+++ b/test/intern.js
@@ -3,7 +3,7 @@ define(function (require) {
   var _ = require('intern/dojo/node!lodash');
 
   return _.assign({
-    debug: false,
+    debug: true,
     capabilities: {
       'selenium-version': '2.47.1',
       'idle-timeout': 30
diff --git a/test/support/pages/Common.js b/test/support/pages/Common.js
index 567590f35851..38f946b2991c 100644
--- a/test/support/pages/Common.js
+++ b/test/support/pages/Common.js
@@ -31,7 +31,10 @@ define(function (require) {
             if (testStatusPage !== false) {
               return self.checkForKibanaApp()
               .then(function (kibanaLoaded) {
-                if (!kibanaLoaded) throw new Error('Kibana is not loaded, retrying');
+                if (!kibanaLoaded) {
+                  throw new Error(moment().format('HH:mm:ss.SSS') + ': ' +
+                  'Kibana is not loaded, retrying');
+                }
               });
             }
           })
@@ -40,7 +43,12 @@ define(function (require) {
           })
           .then(function (currentUrl) {
             var navSuccessful = new RegExp(appUrl).test(currentUrl);
-            if (!navSuccessful) throw new Error('App failed to load: ' + appName);
+            if (!navSuccessful) {
+              throw new Error(moment().format('HH:mm:ss.SSS') + ': ' +
+              'App failed to load: ' + appName +
+              ' in ' + defaultTimeout + 'ms' +
+              ' currentUrl = ' + currentUrl);
+            }
           });
         });
       };