diff --git a/addons/website/tests/ui_suite/ui_test_runner.js b/addons/website/tests/ui_suite/ui_test_runner.js
index 5d0affdb485..75febbb4c9d 100644
--- a/addons/website/tests/ui_suite/ui_test_runner.js
+++ b/addons/website/tests/ui_suite/ui_test_runner.js
@@ -1,5 +1,5 @@
 function waitFor(ready, callback, timeout) {
-    var timeoutMillis = timeout ? Math.round(timeout*1000) : 10000;
+    var timeoutMillis = timeout ? Math.round(timeout*1000) : 30000;
     var start = new Date().getTime();
     var condition = ready();
     var interval = setInterval(function() {
@@ -7,7 +7,7 @@ function waitFor(ready, callback, timeout) {
             condition = ready();
         } else {
             if(!condition) {
-                var message = "Timeout after "+timeoutMillis+" ms\nWaiting for\n"+ready;
+                var message = "Timeout after "+timeoutMillis+" ms";
                 console.log('{ "event": "error", "message": "'+message+'" }');
                 phantom.exit(1);
             } else {