diff --git a/grunt/tasks/webdriver-jasmine.js b/grunt/tasks/webdriver-jasmine.js
index 5d8b2244761..95a57305f94 100644
--- a/grunt/tasks/webdriver-jasmine.js
+++ b/grunt/tasks/webdriver-jasmine.js
@@ -73,11 +73,11 @@ module.exports = function(){
 
 function getJSReport(browser){
   return browser
-    .waitForCondition("typeof window.jasmine != 'undefined'", 5e3)
+    .waitFor(wd.asserters.jsCondition("typeof window.jasmine != 'undefined'"), 5e3, 50)
     .fail(function(error){
       throw Error("The test page didn't load properly. " + error);
     })
-    .waitForCondition("typeof window.jasmine.getJSReport != 'undefined'", 10e3)
-    .waitForCondition("window.postDataToURL.running <= 0", 30e3)
+    .waitFor(wd.asserters.jsCondition("typeof window.jasmine.getJSReport != 'undefined'"), 60e3, 100)
+    .waitFor(wd.asserters.jsCondition("window.postDataToURL.running <= 0"), 30e3, 500)
     .eval("jasmine.getJSReport().passed");
 }
diff --git a/test/index.html b/test/index.html
index e406ef1dc3e..5370e23824e 100644
--- a/test/index.html
+++ b/test/index.html
@@ -24,7 +24,7 @@
     urls.unshift('../node_modules/es5-shim/es5-shim.js');
   }
 
-  var cacheBust = '?_=' + Date.now().toString(36);
+  var cacheBust = '?_=' + (+new Date).toString(36);
 
   for (var urls_index = -1, urls_length = urls.length; ++urls_index < urls_length;) {
     document.write('<script src="' + urls[urls_index] + cacheBust + '"><\/script>');