diff --git a/src/datasource-zabbix/datasource.js b/src/datasource-zabbix/datasource.js
index 739c6d8..3f078e7 100644
--- a/src/datasource-zabbix/datasource.js
+++ b/src/datasource-zabbix/datasource.js
@@ -12,10 +12,8 @@ import { ZabbixAPIError } from './zabbix/connectors/zabbix_api/zabbixAPICore';
 export class ZabbixDatasource {
 
   /** @ngInject */
-  constructor(instanceSettings, templateSrv, alertSrv, dashboardSrv, backendSrv, datasourceSrv, zabbixAlertingSrv) {
+  constructor(instanceSettings, templateSrv, backendSrv, datasourceSrv, zabbixAlertingSrv) {
     this.templateSrv = templateSrv;
-    this.alertSrv = alertSrv;
-    this.dashboardSrv = dashboardSrv;
     this.zabbixAlertingSrv = zabbixAlertingSrv;
 
     // Use custom format for template variables
diff --git a/src/datasource-zabbix/specs/datasource.spec.js b/src/datasource-zabbix/specs/datasource.spec.js
index 3425465..d045a2c 100644
--- a/src/datasource-zabbix/specs/datasource.spec.js
+++ b/src/datasource-zabbix/specs/datasource.spec.js
@@ -1,5 +1,4 @@
 import _ from 'lodash';
-import Q, { Promise } from "q";
 import { Datasource } from "../module";
 import { zabbixTemplateFormat } from "../datasource";
 
@@ -9,7 +8,7 @@ describe('ZabbixDatasource', () => {
   beforeEach(() => {
     ctx.instanceSettings = {
       jsonData: {
-        alerting: true,
+        alerting: false,
         username: 'zabbix',
         password: 'zabbix',
         trends: true,
@@ -21,21 +20,21 @@ describe('ZabbixDatasource', () => {
       }
     };
     ctx.templateSrv = {};
-    ctx.alertSrv = {};
-    ctx.dashboardSrv = {};
+    ctx.backendSrv = {
+      datasourceRequest: jest.fn()
+    };
+    ctx.datasourceSrv = {};
     ctx.zabbixAlertingSrv = {
       setPanelAlertState: jest.fn(),
       removeZabbixThreshold: jest.fn(),
     };
-    ctx.zabbix = () => {};
 
-    ctx.ds = new Datasource(ctx.instanceSettings, ctx.templateSrv, ctx.alertSrv, ctx.dashboardSrv, ctx.zabbixAlertingSrv, ctx.zabbix);
+    ctx.ds = new Datasource(ctx.instanceSettings, ctx.templateSrv, ctx.backendSrv, ctx.datasourceSrv, ctx.zabbixAlertingSrv);
   });
 
   describe('When querying data', () => {
     beforeEach(() => {
       ctx.ds.replaceTemplateVars = (str) => str;
-      ctx.ds.alertQuery = () => Q.when([]);
     });
 
     ctx.options = {
@@ -99,8 +98,7 @@ describe('ZabbixDatasource', () => {
   describe('When querying text data', () => {
     beforeEach(() => {
       ctx.ds.replaceTemplateVars = (str) => str;
-      ctx.ds.alertQuery = () => Q.when([]);
-      ctx.ds.zabbix.getHistory = jest.fn().mockReturnValue(Promise.resolve([
+      ctx.ds.zabbix.zabbixAPI.getHistory = jest.fn().mockReturnValue(Promise.resolve([
         {clock: "1500010200", itemid:"10100", ns:"900111000", value:"Linux first"},
         {clock: "1500010300", itemid:"10100", ns:"900111000", value:"Linux 2nd"},
         {clock: "1500010400", itemid:"10100", ns:"900111000", value:"Linux last"}
@@ -243,10 +241,10 @@ describe('ZabbixDatasource', () => {
     beforeEach(() => {
       ctx.ds.replaceTemplateVars = (str) => str;
       ctx.ds.zabbix = {
-        getGroups: jest.fn().mockReturnValue(Q.when([])),
-        getHosts: jest.fn().mockReturnValue(Q.when([])),
-        getApps: jest.fn().mockReturnValue(Q.when([])),
-        getItems: jest.fn().mockReturnValue(Q.when([]))
+        getGroups: jest.fn().mockReturnValue(Promise.resolve([])),
+        getHosts: jest.fn().mockReturnValue(Promise.resolve([])),
+        getApps: jest.fn().mockReturnValue(Promise.resolve([])),
+        getItems: jest.fn().mockReturnValue(Promise.resolve([]))
       };
     });
 
@@ -341,7 +339,7 @@ describe('ZabbixDatasource', () => {
         "hosts": [{"hostid": "10631", "name": "Test host"}],
         "item": "Test item"
       }];
-      ctx.ds.zabbix.getItemsFromTarget = () => Promise.resolve(targetItems);
+      ctx.ds.zabbix.getItemsFromTarget = jest.fn().mockReturnValue(Promise.resolve(targetItems));
 
       options = {
         "panelId": 10,
@@ -362,7 +360,7 @@ describe('ZabbixDatasource', () => {
         "expression": "{15915}<100",
       }];
 
-      ctx.ds.zabbix.getAlerts = () => Promise.resolve(itemTriggers);
+      ctx.ds.zabbix.getAlerts = jest.fn().mockReturnValue(Promise.resolve(itemTriggers));
 
       return ctx.ds.alertQuery(options)
         .then(resp => {
@@ -380,7 +378,7 @@ describe('ZabbixDatasource', () => {
         "expression": "{15915}<=100",
       }];
 
-      ctx.ds.zabbix.getAlerts = () => Promise.resolve(itemTriggers);
+      ctx.ds.zabbix.getAlerts = jest.fn().mockReturnValue(Promise.resolve(itemTriggers));
 
       return ctx.ds.alertQuery(options)
         .then(resp => {
@@ -398,7 +396,7 @@ describe('ZabbixDatasource', () => {
         "expression": "{15915}>=30",
       }];
 
-      ctx.ds.zabbix.getAlerts = () => Promise.resolve(itemTriggers);
+      ctx.ds.zabbix.getAlerts = jest.fn().mockReturnValue(Promise.resolve(itemTriggers));
 
       return ctx.ds.alertQuery(options)
         .then(resp => {
@@ -416,7 +414,7 @@ describe('ZabbixDatasource', () => {
         "expression": "{15915}=50",
       }];
 
-      ctx.ds.zabbix.getAlerts = () => Promise.resolve(itemTriggers);
+      ctx.ds.zabbix.getAlerts = jest.fn().mockReturnValue(Promise.resolve(itemTriggers));
 
       return ctx.ds.alertQuery(options)
         .then(resp => {