diff --git a/public/app/plugins/datasource/elasticsearch/specs/query_builder_specs.ts b/public/app/plugins/datasource/elasticsearch/specs/query_builder.jest.ts
similarity index 69%
rename from public/app/plugins/datasource/elasticsearch/specs/query_builder_specs.ts
rename to public/app/plugins/datasource/elasticsearch/specs/query_builder.jest.ts
index 6d7b160fbef..1dde47915d9 100644
--- a/public/app/plugins/datasource/elasticsearch/specs/query_builder_specs.ts
+++ b/public/app/plugins/datasource/elasticsearch/specs/query_builder.jest.ts
@@ -1,25 +1,24 @@
-import { describe, beforeEach, it, expect } from 'test/lib/common';
 import { ElasticQueryBuilder } from '../query_builder';
 
-describe('ElasticQueryBuilder', function() {
+describe('ElasticQueryBuilder', () => {
   var builder;
 
-  beforeEach(function() {
+  beforeEach(() => {
     builder = new ElasticQueryBuilder({ timeField: '@timestamp' });
   });
 
-  it('with defaults', function() {
+  it('with defaults', () => {
     var query = builder.build({
       metrics: [{ type: 'Count', id: '0' }],
       timeField: '@timestamp',
       bucketAggs: [{ type: 'date_histogram', field: '@timestamp', id: '1' }],
     });
 
-    expect(query.query.bool.filter[0].range['@timestamp'].gte).to.be('$timeFrom');
-    expect(query.aggs['1'].date_histogram.extended_bounds.min).to.be('$timeFrom');
+    expect(query.query.bool.filter[0].range['@timestamp'].gte).toBe('$timeFrom');
+    expect(query.aggs['1'].date_histogram.extended_bounds.min).toBe('$timeFrom');
   });
 
-  it('with defaults on es5.x', function() {
+  it('with defaults on es5.x', () => {
     var builder_5x = new ElasticQueryBuilder({
       timeField: '@timestamp',
       esVersion: 5,
@@ -31,11 +30,11 @@ describe('ElasticQueryBuilder', function() {
       bucketAggs: [{ type: 'date_histogram', field: '@timestamp', id: '1' }],
     });
 
-    expect(query.query.bool.filter[0].range['@timestamp'].gte).to.be('$timeFrom');
-    expect(query.aggs['1'].date_histogram.extended_bounds.min).to.be('$timeFrom');
+    expect(query.query.bool.filter[0].range['@timestamp'].gte).toBe('$timeFrom');
+    expect(query.aggs['1'].date_histogram.extended_bounds.min).toBe('$timeFrom');
   });
 
-  it('with multiple bucket aggs', function() {
+  it('with multiple bucket aggs', () => {
     var query = builder.build({
       metrics: [{ type: 'count', id: '1' }],
       timeField: '@timestamp',
@@ -45,11 +44,11 @@ describe('ElasticQueryBuilder', function() {
       ],
     });
 
-    expect(query.aggs['2'].terms.field).to.be('@host');
-    expect(query.aggs['2'].aggs['3'].date_histogram.field).to.be('@timestamp');
+    expect(query.aggs['2'].terms.field).toBe('@host');
+    expect(query.aggs['2'].aggs['3'].date_histogram.field).toBe('@timestamp');
   });
 
-  it('with select field', function() {
+  it('with select field', () => {
     var query = builder.build(
       {
         metrics: [{ type: 'avg', field: '@value', id: '1' }],
@@ -60,10 +59,10 @@ describe('ElasticQueryBuilder', function() {
     );
 
     var aggs = query.aggs['2'].aggs;
-    expect(aggs['1'].avg.field).to.be('@value');
+    expect(aggs['1'].avg.field).toBe('@value');
   });
 
-  it('with term agg and order by metric agg', function() {
+  it('with term agg and order by metric agg', () => {
     var query = builder.build(
       {
         metrics: [{ type: 'count', id: '1' }, { type: 'avg', field: '@value', id: '5' }],
@@ -84,11 +83,11 @@ describe('ElasticQueryBuilder', function() {
     var firstLevel = query.aggs['2'];
     var secondLevel = firstLevel.aggs['3'];
 
-    expect(firstLevel.aggs['5'].avg.field).to.be('@value');
-    expect(secondLevel.aggs['5'].avg.field).to.be('@value');
+    expect(firstLevel.aggs['5'].avg.field).toBe('@value');
+    expect(secondLevel.aggs['5'].avg.field).toBe('@value');
   });
 
-  it('with metric percentiles', function() {
+  it('with metric percentiles', () => {
     var query = builder.build(
       {
         metrics: [
@@ -109,11 +108,11 @@ describe('ElasticQueryBuilder', function() {
 
     var firstLevel = query.aggs['3'];
 
-    expect(firstLevel.aggs['1'].percentiles.field).to.be('@load_time');
-    expect(firstLevel.aggs['1'].percentiles.percents).to.eql([1, 2, 3, 4]);
+    expect(firstLevel.aggs['1'].percentiles.field).toBe('@load_time');
+    expect(firstLevel.aggs['1'].percentiles.percents).toEqual([1, 2, 3, 4]);
   });
 
-  it('with filters aggs', function() {
+  it('with filters aggs', () => {
     var query = builder.build({
       metrics: [{ type: 'count', id: '1' }],
       timeField: '@timestamp',
@@ -129,12 +128,12 @@ describe('ElasticQueryBuilder', function() {
       ],
     });
 
-    expect(query.aggs['2'].filters.filters['@metric:cpu'].query_string.query).to.be('@metric:cpu');
-    expect(query.aggs['2'].filters.filters['@metric:logins.count'].query_string.query).to.be('@metric:logins.count');
-    expect(query.aggs['2'].aggs['4'].date_histogram.field).to.be('@timestamp');
+    expect(query.aggs['2'].filters.filters['@metric:cpu'].query_string.query).toBe('@metric:cpu');
+    expect(query.aggs['2'].filters.filters['@metric:logins.count'].query_string.query).toBe('@metric:logins.count');
+    expect(query.aggs['2'].aggs['4'].date_histogram.field).toBe('@timestamp');
   });
 
-  it('with filters aggs on es5.x', function() {
+  it('with filters aggs on es5.x', () => {
     var builder_5x = new ElasticQueryBuilder({
       timeField: '@timestamp',
       esVersion: 5,
@@ -154,31 +153,31 @@ describe('ElasticQueryBuilder', function() {
       ],
     });
 
-    expect(query.aggs['2'].filters.filters['@metric:cpu'].query_string.query).to.be('@metric:cpu');
-    expect(query.aggs['2'].filters.filters['@metric:logins.count'].query_string.query).to.be('@metric:logins.count');
-    expect(query.aggs['2'].aggs['4'].date_histogram.field).to.be('@timestamp');
+    expect(query.aggs['2'].filters.filters['@metric:cpu'].query_string.query).toBe('@metric:cpu');
+    expect(query.aggs['2'].filters.filters['@metric:logins.count'].query_string.query).toBe('@metric:logins.count');
+    expect(query.aggs['2'].aggs['4'].date_histogram.field).toBe('@timestamp');
   });
 
-  it('with raw_document metric', function() {
+  it('with raw_document metric', () => {
     var query = builder.build({
       metrics: [{ type: 'raw_document', id: '1', settings: {} }],
       timeField: '@timestamp',
       bucketAggs: [],
     });
 
-    expect(query.size).to.be(500);
+    expect(query.size).toBe(500);
   });
-  it('with raw_document metric size set', function() {
+  it('with raw_document metric size set', () => {
     var query = builder.build({
       metrics: [{ type: 'raw_document', id: '1', settings: { size: 1337 } }],
       timeField: '@timestamp',
       bucketAggs: [],
     });
 
-    expect(query.size).to.be(1337);
+    expect(query.size).toBe(1337);
   });
 
-  it('with moving average', function() {
+  it('with moving average', () => {
     var query = builder.build({
       metrics: [
         {
@@ -198,12 +197,12 @@ describe('ElasticQueryBuilder', function() {
 
     var firstLevel = query.aggs['3'];
 
-    expect(firstLevel.aggs['2']).not.to.be(undefined);
-    expect(firstLevel.aggs['2'].moving_avg).not.to.be(undefined);
-    expect(firstLevel.aggs['2'].moving_avg.buckets_path).to.be('3');
+    expect(firstLevel.aggs['2']).not.toBe(undefined);
+    expect(firstLevel.aggs['2'].moving_avg).not.toBe(undefined);
+    expect(firstLevel.aggs['2'].moving_avg.buckets_path).toBe('3');
   });
 
-  it('with broken moving average', function() {
+  it('with broken moving average', () => {
     var query = builder.build({
       metrics: [
         {
@@ -227,13 +226,13 @@ describe('ElasticQueryBuilder', function() {
 
     var firstLevel = query.aggs['3'];
 
-    expect(firstLevel.aggs['2']).not.to.be(undefined);
-    expect(firstLevel.aggs['2'].moving_avg).not.to.be(undefined);
-    expect(firstLevel.aggs['2'].moving_avg.buckets_path).to.be('3');
-    expect(firstLevel.aggs['4']).to.be(undefined);
+    expect(firstLevel.aggs['2']).not.toBe(undefined);
+    expect(firstLevel.aggs['2'].moving_avg).not.toBe(undefined);
+    expect(firstLevel.aggs['2'].moving_avg.buckets_path).toBe('3');
+    expect(firstLevel.aggs['4']).toBe(undefined);
   });
 
-  it('with derivative', function() {
+  it('with derivative', () => {
     var query = builder.build({
       metrics: [
         {
@@ -252,12 +251,12 @@ describe('ElasticQueryBuilder', function() {
 
     var firstLevel = query.aggs['3'];
 
-    expect(firstLevel.aggs['2']).not.to.be(undefined);
-    expect(firstLevel.aggs['2'].derivative).not.to.be(undefined);
-    expect(firstLevel.aggs['2'].derivative.buckets_path).to.be('3');
+    expect(firstLevel.aggs['2']).not.toBe(undefined);
+    expect(firstLevel.aggs['2'].derivative).not.toBe(undefined);
+    expect(firstLevel.aggs['2'].derivative.buckets_path).toBe('3');
   });
 
-  it('with histogram', function() {
+  it('with histogram', () => {
     var query = builder.build({
       metrics: [{ id: '1', type: 'count' }],
       bucketAggs: [
@@ -271,13 +270,13 @@ describe('ElasticQueryBuilder', function() {
     });
 
     var firstLevel = query.aggs['3'];
-    expect(firstLevel.histogram.field).to.be('bytes');
-    expect(firstLevel.histogram.interval).to.be(10);
-    expect(firstLevel.histogram.min_doc_count).to.be(2);
-    expect(firstLevel.histogram.missing).to.be(5);
+    expect(firstLevel.histogram.field).toBe('bytes');
+    expect(firstLevel.histogram.interval).toBe(10);
+    expect(firstLevel.histogram.min_doc_count).toBe(2);
+    expect(firstLevel.histogram.missing).toBe(5);
   });
 
-  it('with adhoc filters', function() {
+  it('with adhoc filters', () => {
     var query = builder.build(
       {
         metrics: [{ type: 'Count', id: '0' }],
@@ -295,12 +294,12 @@ describe('ElasticQueryBuilder', function() {
       ]
     );
 
-    expect(query.query.bool.must[0].match_phrase['key1'].query).to.be('value1');
-    expect(query.query.bool.must[1].match_phrase['key2'].query).to.be('value2');
-    expect(query.query.bool.must_not[0].match_phrase['key2'].query).to.be('value2');
-    expect(query.query.bool.filter[2].range['key3'].lt).to.be('value3');
-    expect(query.query.bool.filter[3].range['key4'].gt).to.be('value4');
-    expect(query.query.bool.filter[4].regexp['key5']).to.be('value5');
-    expect(query.query.bool.filter[5].bool.must_not.regexp['key6']).to.be('value6');
+    expect(query.query.bool.must[0].match_phrase['key1'].query).toBe('value1');
+    expect(query.query.bool.must[1].match_phrase['key2'].query).toBe('value2');
+    expect(query.query.bool.must_not[0].match_phrase['key2'].query).toBe('value2');
+    expect(query.query.bool.filter[2].range['key3'].lt).toBe('value3');
+    expect(query.query.bool.filter[3].range['key4'].gt).toBe('value4');
+    expect(query.query.bool.filter[4].regexp['key5']).toBe('value5');
+    expect(query.query.bool.filter[5].bool.must_not.regexp['key6']).toBe('value6');
   });
 });