diff --git a/public/app/plugins/datasource/graphite/specs/query_ctrl_specs.ts b/public/app/plugins/datasource/graphite/specs/query_ctrl_specs.ts
index 8c191bba528..663400a7dd5 100644
--- a/public/app/plugins/datasource/graphite/specs/query_ctrl_specs.ts
+++ b/public/app/plugins/datasource/graphite/specs/query_ctrl_specs.ts
@@ -160,4 +160,27 @@ describe('GraphiteQueryCtrl', function() {
       expect(ctx.panelCtrl.refresh.called).to.be(true);
     });
   });
+
+  describe('when updating targets with nested query', function() {
+    beforeEach(function() {
+      ctx.ctrl.target.target = 'scaleToSeconds(#A)';
+      ctx.ctrl.datasource.metricFindQuery = sinon.stub().returns(ctx.$q.when([{expandable: false}]));
+      ctx.ctrl.parseTarget();
+
+      ctx.ctrl.panelCtrl.panel.targets = [ {
+        target: 'nested.query.count',
+        refId: 'A'
+      }];
+
+      ctx.ctrl.updateModelTarget();
+    });
+
+    it('target should remain the same', function() {
+      expect(ctx.ctrl.target.target).to.be('scaleToSeconds(#A)');
+    });
+
+    it('targetFull should include nexted queries', function() {
+      expect(ctx.ctrl.target.targetFull).to.be('scaleToSeconds(nested.query.count)');
+    });
+  });
 });