diff --git a/Gruntfile.js b/Gruntfile.js
index ca6bad83f..e303b0522 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -46,14 +46,14 @@ module.exports = function (grunt) {
             platform: 'Windows 8.1'
         },
         {
-            browserName: "edge",
+            browserName: "MicrosoftEdge",
             version: '13',
             platform: 'Windows 10'
         },
         // Mobile browsers
         {
             browserName: "ipad",
-            version: '8.0',
+            version: '8.4',
             platform: 'OS X 10.9',
             'device-orientation': 'portrait'
         },
@@ -93,7 +93,7 @@ module.exports = function (grunt) {
         sauceJobs[testName] = {
             options: {
                 urls: ["http://localhost:8081/tmp/browser/test-runner-" + testName + ".html"],
-                testname: 'Less.js test - ' + testName,
+                testname: testName,
                 browsers: browsers,
                 public: 'public',
                 recordVideo: false,
diff --git a/lib/less-browser/bootstrap.js b/lib/less-browser/bootstrap.js
index 72b02c162..8dec24d68 100644
--- a/lib/less-browser/bootstrap.js
+++ b/lib/less-browser/bootstrap.js
@@ -28,6 +28,10 @@ function resolveOrReject(data) {
     }
 }
 
+less.pageLoadFinished = new Promise(function() {
+    return less.refresh(less.env === 'development').then(resolveOrReject, resolveOrReject);
+});
+
 if (options.onReady) {
     if (/!watch/.test(window.location.hash)) {
         less.watch();
@@ -48,5 +52,5 @@ if (options.onReady) {
         head.appendChild(style);
     }
     less.registerStylesheetsImmediately();
-    less.pageLoadFinished = less.refresh(less.env === 'development').then(resolveOrReject, resolveOrReject);
+    less.refresh(less.env === 'development').then(resolveOrReject, resolveOrReject);
 }