diff --git a/.travis.yml b/.travis.yml
index 4df05e8917ba7..2716813922051 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,10 +13,10 @@ notifications:
   hipchat:
     rooms:
       secure: a2FERvICecrUAR62vP4vrUCTG3haRzf6kSzDDzGu6SICEXWLRrK0xeNQDpdwDAfzFmaIJ6txpkmInvEFeNPYNngTgEDyfhqdIa/lW0Ermdg+1hL0dK6QJiVmT1V6LDB2mgtaTTmfontxJqq7P2tmr0zz8ny4Eqq3lUnwPxYFNNo=
-    template:
-    - ! '%{repository}/%{branch} #%{build_number} by %{author}: %{message} (<a href="%{build_url}">open</a>)'
     format: html
     on_success: change
+    template:
+    - ! '%{repository_slug}/%{branch} by %{author}: %{commit_message} (<a href="%{build_url}">open</a>)'
 env:
   global:
     secure: AX9xidE0quyS07ZfOcecxEGjlNDT9YlM+fvtQHqOaODBII2jg5rgz0SyyxmTPSG68aqUNk8ML9slbRE4h0iPqNkB6fbDE2Dc6oTrRE7XFGDBjw66OHV2ZbsobdORf4UtWO06JBgLUEU2pzRYphe/B14dyA+ZO6p+bAgBmcdLd8k=
diff --git a/Gruntfile.js b/Gruntfile.js
index fe56233649da2..532b3e5e829fd 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -38,5 +38,5 @@ module.exports = function (grunt) {
   });
 
   // load task definitions
-  grunt.loadTasks('tasks');
+  grunt.task.loadTasks('tasks');
 };
diff --git a/tasks/config/saucelabs-mocha.js b/tasks/config/saucelabs-mocha.js
index 5ad350214878f..8c3286fe16f72 100644
--- a/tasks/config/saucelabs-mocha.js
+++ b/tasks/config/saucelabs-mocha.js
@@ -6,15 +6,14 @@ if (process.env.TRAVIS_BUILD_ID) {
 module.exports = {
   unit: {
     options: {
-      urls: [
-        'http://localhost:8000/test/unit/?saucelabs=true'
-      ],
+      username: 'kibana',
+      key: process.env.SAUCE_ACCESS_KEY,
+      urls: ['http://localhost:8000/test/unit/?saucelabs=true'],
       testname: 'Kibana Browser Tests',
       build: buildId,
       concurrency: 10,
-      username: 'kibana',
-      key: process.env.SAUCE_ACCESS_KEY,
-      'max-duration': 360,
+      'max-duration': 60,
+      maxRetries: 1,
       browsers: [
         {
           browserName: 'chrome',
diff --git a/tasks/server.js b/tasks/server.js
index 066099fb3bc6c..c75550e5106db 100644
--- a/tasks/server.js
+++ b/tasks/server.js
@@ -3,6 +3,7 @@ module.exports = function (grunt) {
     var done = this.async();
     var DevServer = require('../test/utils/dev_server');
     var server = new DevServer();
+
     server.listen(8000).then(function () {
       console.log('visit http://localhost:8000');
       if (keepalive !== 'keepalive') done();
diff --git a/tasks/test.js b/tasks/test.js
index 610addbea0bcf..07f61dba31412 100644
--- a/tasks/test.js
+++ b/tasks/test.js
@@ -1,16 +1,27 @@
 var _ = require('lodash');
 module.exports = function (grunt) {
 
-  var testTask = process.env.TRAVIS ? 'saucelabs-mocha:unit' : 'mocha:unit';
 
-  grunt.registerTask('test', [
-    'jshint',
-    'ruby_server',
-    'maybe_start_server',
-    'jade',
-    'less',
-    testTask
-  ]);
+  grunt.registerTask('test', function () {
+    var testTask = 'mocha:unit';
+    if (process.env.TRAVIS && !process.env.SAUCE_ACCESS_KEY) {
+      grunt.log.writeln(grunt.log.wordlist([
+        '>> SAUCE_ACCESS_KEY not set in env, running with Phantom'
+      ], {color: 'yellow'}));
+    } else {
+      testTask = 'saucelabs-mocha:unit';
+    }
+
+    var tasks = [
+      'jshint',
+      'ruby_server',
+      'maybe_start_server',
+      'jade',
+      'less',
+      testTask
+    ];
+    grunt.task.run(tasks);
+  });
 
   grunt.registerTask('coverage', [
     'blanket',