diff --git a/public/app/core/utils/datemath.ts b/public/app/core/utils/datemath.ts
index b66325c71a8..467d3750c9a 100644
--- a/public/app/core/utils/datemath.ts
+++ b/public/app/core/utils/datemath.ts
@@ -28,7 +28,7 @@ export function parse(text, roundUp?) {
       mathString = text.substring(index + 2);
     }
     // We're going to just require ISO8601 timestamps, k?
-    time = moment(parseString);
+    time = moment(parseString, moment.ISO_8601);
   }
 
   if (!mathString.length) {
diff --git a/public/test/specs/unsavedChangesSrv-specs.js b/public/test/specs/unsavedChangesSrv-specs.js
index af88ff77ea6..ddbbb557055 100644
--- a/public/test/specs/unsavedChangesSrv-specs.js
+++ b/public/test/specs/unsavedChangesSrv-specs.js
@@ -29,6 +29,7 @@ define([
 
     beforeEach(function() {
       dash = _dashboardSrv.create({
+        refresh: false,
         rows: [
           {
             panels: [{ test: "asd", legend: { } }]