diff --git a/public/app/features/dashboard/dynamic_dashboard_srv.ts b/public/app/features/dashboard/dynamic_dashboard_srv.ts
index 21f1468f359..b3b13bdc199 100644
--- a/public/app/features/dashboard/dynamic_dashboard_srv.ts
+++ b/public/app/features/dashboard/dynamic_dashboard_srv.ts
@@ -24,7 +24,7 @@ export class DynamicDashboardSrv {
     if (dashboard.templating.list.length === 0) { return; }
 
     this.dashboard = dashboard;
-    this.iteration = new Date().getTime();
+    this.iteration = (this.iteration || new Date().getTime()) + 1;
 
     var cleanUpOnly = options.cleanUpOnly;
 
diff --git a/public/test/specs/dynamicDashboardSrv-specs.js b/public/test/specs/dynamicDashboardSrv-specs.js
index a09c3788377..b6d3a6d52fb 100644
--- a/public/test/specs/dynamicDashboardSrv-specs.js
+++ b/public/test/specs/dynamicDashboardSrv-specs.js
@@ -1,5 +1,5 @@
 define([
-  'app/features/dashboard/dynamicDashboardSrv',
+  'app/features/dashboard/dynamic_dashboard_srv',
   'app/features/dashboard/dashboardSrv'
 ], function() {
   'use strict';
@@ -12,6 +12,7 @@ define([
       ctx.setup = function (setupFunc) {
 
         beforeEach(module('grafana.services'));
+        beforeEach(module('grafana.core'));
         beforeEach(module(function($provide) {
           $provide.value('contextSrv', {
             user: { timezone: 'utc'}