diff --git a/public/app/plugins/datasource/influxdb/query_ctrl.ts b/public/app/plugins/datasource/influxdb/query_ctrl.ts
index ce669c9f458..17449711143 100644
--- a/public/app/plugins/datasource/influxdb/query_ctrl.ts
+++ b/public/app/plugins/datasource/influxdb/query_ctrl.ts
@@ -338,7 +338,7 @@ export class InfluxQueryCtrl extends QueryCtrl {
         this.tagSegments.push(this.uiSegmentSrv.newPlusButton());
       }
     }
-
+    console.log(this.tagSegments);
     this.rebuildTargetTagConditions();
   }
 
diff --git a/public/app/plugins/datasource/influxdb/specs/query_ctrl.jest.ts b/public/app/plugins/datasource/influxdb/specs/query_ctrl.jest.ts
index dd6c9b4fa18..0c1ed3ed6b2 100644
--- a/public/app/plugins/datasource/influxdb/specs/query_ctrl.jest.ts
+++ b/public/app/plugins/datasource/influxdb/specs/query_ctrl.jest.ts
@@ -46,7 +46,7 @@ describe('InfluxDBQueryCtrl', () => {
   InfluxQueryCtrl.prototype.panelCtrl = {
     refresh: jest.fn(),
     panel: {
-      targets: InfluxQueryCtrl.prototype.target,
+      targets: [InfluxQueryCtrl.prototype.target],
     },
   };
   InfluxQueryCtrl.prototype.datasource = {
@@ -69,6 +69,7 @@ describe('InfluxDBQueryCtrl', () => {
       new uiSegmentSrv({ trustAsHtml: jest.fn() }, { highlightVariablesAsHtml: jest.fn() })
     );
   });
+
   describe('init', () => {
     it('should init tagSegments', () => {
       expect(influxQueryCtrl.tagSegments.length).toBe(1);
@@ -90,7 +91,6 @@ describe('InfluxDBQueryCtrl', () => {
     });
 
     it('should add tagSegments', () => {
-      console.log(influxQueryCtrl.tagSegments);
       expect(influxQueryCtrl.tagSegments.length).toBe(3);
     });
   });
diff --git a/public/app/plugins/datasource/influxdb/specs/query_ctrl_specs.ts b/public/app/plugins/datasource/influxdb/specs/query_ctrl_specs.ts
new file mode 100644
index 00000000000..151dd7ab0c6
--- /dev/null
+++ b/public/app/plugins/datasource/influxdb/specs/query_ctrl_specs.ts
@@ -0,0 +1,195 @@
+import '../query_ctrl';
+import 'app/core/services/segment_srv';
+import { describe, beforeEach, it, sinon, expect, angularMocks } from 'test/lib/common';
+import helpers from 'test/specs/helpers';
+import { InfluxQueryCtrl } from '../query_ctrl';
+
+describe('InfluxDBQueryCtrl', function() {
+  var ctx = new helpers.ControllerTestContext();
+
+  beforeEach(angularMocks.module('grafana.core'));
+  beforeEach(angularMocks.module('grafana.controllers'));
+  beforeEach(angularMocks.module('grafana.services'));
+  beforeEach(
+    angularMocks.module(function($compileProvider) {
+      $compileProvider.preAssignBindingsEnabled(true);
+    })
+  );
+  beforeEach(ctx.providePhase());
+
+  beforeEach(
+    angularMocks.inject(($rootScope, $controller, $q) => {
+      ctx.$q = $q;
+      ctx.scope = $rootScope.$new();
+      ctx.datasource.metricFindQuery = sinon.stub().returns(ctx.$q.when([]));
+      ctx.target = { target: {} };
+      ctx.panelCtrl = {
+        panel: {
+          targets: [ctx.target],
+        },
+      };
+      ctx.panelCtrl.refresh = sinon.spy();
+      ctx.ctrl = $controller(
+        InfluxQueryCtrl,
+        { $scope: ctx.scope },
+        {
+          panelCtrl: ctx.panelCtrl,
+          target: ctx.target,
+          datasource: ctx.datasource,
+        }
+      );
+    })
+  );
+
+  describe('init', function() {
+    it('should init tagSegments', function() {
+      expect(ctx.ctrl.tagSegments.length).to.be(1);
+    });
+
+    it('should init measurementSegment', function() {
+      expect(ctx.ctrl.measurementSegment.value).to.be('select measurement');
+    });
+  });
+
+  describe('when first tag segment is updated', function() {
+    beforeEach(function() {
+      ctx.ctrl.tagSegmentUpdated({ value: 'asd', type: 'plus-button' }, 0);
+    });
+
+    it('should update tag key', function() {
+      console.log(ctx.ctrl.target.tags);
+      expect(ctx.ctrl.target.tags[0].key).to.be('asd');
+      expect(ctx.ctrl.tagSegments[0].type).to.be('key');
+    });
+
+    it('should add tagSegments', function() {
+      console.log(ctx.ctrl.tagSegments);
+      expect(ctx.ctrl.tagSegments.length).to.be(3);
+    });
+  });
+
+  describe('when last tag value segment is updated', function() {
+    beforeEach(function() {
+      ctx.ctrl.tagSegmentUpdated({ value: 'asd', type: 'plus-button' }, 0);
+      ctx.ctrl.tagSegmentUpdated({ value: 'server1', type: 'value' }, 2);
+    });
+
+    it('should update tag value', function() {
+      expect(ctx.ctrl.target.tags[0].value).to.be('server1');
+    });
+
+    it('should set tag operator', function() {
+      expect(ctx.ctrl.target.tags[0].operator).to.be('=');
+    });
+
+    it('should add plus button for another filter', function() {
+      expect(ctx.ctrl.tagSegments[3].fake).to.be(true);
+    });
+  });
+
+  describe('when last tag value segment is updated to regex', function() {
+    beforeEach(function() {
+      ctx.ctrl.tagSegmentUpdated({ value: 'asd', type: 'plus-button' }, 0);
+      ctx.ctrl.tagSegmentUpdated({ value: '/server.*/', type: 'value' }, 2);
+    });
+
+    it('should update operator', function() {
+      expect(ctx.ctrl.tagSegments[1].value).to.be('=~');
+      expect(ctx.ctrl.target.tags[0].operator).to.be('=~');
+    });
+  });
+
+  describe('when second tag key is added', function() {
+    beforeEach(function() {
+      ctx.ctrl.tagSegmentUpdated({ value: 'asd', type: 'plus-button' }, 0);
+      ctx.ctrl.tagSegmentUpdated({ value: 'server1', type: 'value' }, 2);
+      ctx.ctrl.tagSegmentUpdated({ value: 'key2', type: 'plus-button' }, 3);
+    });
+
+    it('should update tag key', function() {
+      expect(ctx.ctrl.target.tags[1].key).to.be('key2');
+    });
+
+    it('should add AND segment', function() {
+      expect(ctx.ctrl.tagSegments[3].value).to.be('AND');
+    });
+  });
+
+  describe('when condition is changed', function() {
+    beforeEach(function() {
+      ctx.ctrl.tagSegmentUpdated({ value: 'asd', type: 'plus-button' }, 0);
+      ctx.ctrl.tagSegmentUpdated({ value: 'server1', type: 'value' }, 2);
+      ctx.ctrl.tagSegmentUpdated({ value: 'key2', type: 'plus-button' }, 3);
+      ctx.ctrl.tagSegmentUpdated({ value: 'OR', type: 'condition' }, 3);
+    });
+
+    it('should update tag condition', function() {
+      expect(ctx.ctrl.target.tags[1].condition).to.be('OR');
+    });
+
+    it('should update AND segment', function() {
+      expect(ctx.ctrl.tagSegments[3].value).to.be('OR');
+      expect(ctx.ctrl.tagSegments.length).to.be(7);
+    });
+  });
+
+  describe('when deleting first tag filter after value is selected', function() {
+    beforeEach(function() {
+      ctx.ctrl.tagSegmentUpdated({ value: 'asd', type: 'plus-button' }, 0);
+      ctx.ctrl.tagSegmentUpdated({ value: 'server1', type: 'value' }, 2);
+      ctx.ctrl.tagSegmentUpdated(ctx.ctrl.removeTagFilterSegment, 0);
+    });
+
+    it('should remove tags', function() {
+      expect(ctx.ctrl.target.tags.length).to.be(0);
+    });
+
+    it('should remove all segment after 2 and replace with plus button', function() {
+      expect(ctx.ctrl.tagSegments.length).to.be(1);
+      expect(ctx.ctrl.tagSegments[0].type).to.be('plus-button');
+    });
+  });
+
+  describe('when deleting second tag value before second tag value is complete', function() {
+    beforeEach(function() {
+      ctx.ctrl.tagSegmentUpdated({ value: 'asd', type: 'plus-button' }, 0);
+      ctx.ctrl.tagSegmentUpdated({ value: 'server1', type: 'value' }, 2);
+      ctx.ctrl.tagSegmentUpdated({ value: 'key2', type: 'plus-button' }, 3);
+      ctx.ctrl.tagSegmentUpdated(ctx.ctrl.removeTagFilterSegment, 4);
+    });
+
+    it('should remove all segment after 2 and replace with plus button', function() {
+      expect(ctx.ctrl.tagSegments.length).to.be(4);
+      expect(ctx.ctrl.tagSegments[3].type).to.be('plus-button');
+    });
+  });
+
+  describe('when deleting second tag value before second tag value is complete', function() {
+    beforeEach(function() {
+      ctx.ctrl.tagSegmentUpdated({ value: 'asd', type: 'plus-button' }, 0);
+      ctx.ctrl.tagSegmentUpdated({ value: 'server1', type: 'value' }, 2);
+      ctx.ctrl.tagSegmentUpdated({ value: 'key2', type: 'plus-button' }, 3);
+      ctx.ctrl.tagSegmentUpdated(ctx.ctrl.removeTagFilterSegment, 4);
+    });
+
+    it('should remove all segment after 2 and replace with plus button', function() {
+      expect(ctx.ctrl.tagSegments.length).to.be(4);
+      expect(ctx.ctrl.tagSegments[3].type).to.be('plus-button');
+    });
+  });
+
+  describe('when deleting second tag value after second tag filter is complete', function() {
+    beforeEach(function() {
+      ctx.ctrl.tagSegmentUpdated({ value: 'asd', type: 'plus-button' }, 0);
+      ctx.ctrl.tagSegmentUpdated({ value: 'server1', type: 'value' }, 2);
+      ctx.ctrl.tagSegmentUpdated({ value: 'key2', type: 'plus-button' }, 3);
+      ctx.ctrl.tagSegmentUpdated({ value: 'value', type: 'value' }, 6);
+      ctx.ctrl.tagSegmentUpdated(ctx.ctrl.removeTagFilterSegment, 4);
+    });
+
+    it('should remove all segment after 2 and replace with plus button', function() {
+      expect(ctx.ctrl.tagSegments.length).to.be(4);
+      expect(ctx.ctrl.tagSegments[3].type).to.be('plus-button');
+    });
+  });
+});