diff --git a/public/app/plugins/datasource/stackdriver/components/AnnotationQueryEditor.tsx b/public/app/plugins/datasource/stackdriver/components/AnnotationQueryEditor.tsx
index e6942d2195c..d5f8e3af78e 100644
--- a/public/app/plugins/datasource/stackdriver/components/AnnotationQueryEditor.tsx
+++ b/public/app/plugins/datasource/stackdriver/components/AnnotationQueryEditor.tsx
@@ -1,6 +1,9 @@
 import React from 'react';
 import _ from 'lodash';
 
+import { TemplateSrv } from 'app/features/templating/template_srv';
+
+import StackdriverDatasource from '../datasource';
 import { Metrics } from './Metrics';
 import { Filter } from './Filter';
 import { AnnotationTarget } from '../types';
@@ -9,8 +12,8 @@ import { AnnotationsHelp } from './AnnotationsHelp';
 export interface Props {
   onQueryChange: (target: AnnotationTarget) => void;
   target: AnnotationTarget;
-  datasource: any;
-  templateSrv: any;
+  datasource: StackdriverDatasource;
+  templateSrv: TemplateSrv;
 }
 
 interface State extends AnnotationTarget {
diff --git a/public/app/plugins/datasource/stackdriver/components/Help.tsx b/public/app/plugins/datasource/stackdriver/components/Help.tsx
index 2510338cce4..43cbe13e334 100644
--- a/public/app/plugins/datasource/stackdriver/components/Help.tsx
+++ b/public/app/plugins/datasource/stackdriver/components/Help.tsx
@@ -1,8 +1,9 @@
 import React from 'react';
 import { Project } from './Project';
+import StackdriverDatasource from '../datasource';
 
 export interface Props {
-  datasource: any;
+  datasource: StackdriverDatasource;
   rawQuery: string;
   lastQueryError: string;
 }
diff --git a/public/app/plugins/datasource/stackdriver/components/Metrics.tsx b/public/app/plugins/datasource/stackdriver/components/Metrics.tsx
index 3c04cb07183..55dbbfa31ac 100644
--- a/public/app/plugins/datasource/stackdriver/components/Metrics.tsx
+++ b/public/app/plugins/datasource/stackdriver/components/Metrics.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import _ from 'lodash';
 
+import StackdriverDatasource from '../datasource';
 import appEvents from 'app/core/app_events';
 import { MetricDescriptor } from '../types';
 import { MetricSelect } from 'app/core/components/Select/MetricSelect';
@@ -8,7 +9,7 @@ import { MetricSelect } from 'app/core/components/Select/MetricSelect';
 export interface Props {
   onChange: (metricDescriptor: MetricDescriptor) => void;
   templateSrv: any;
-  datasource: any;
+  datasource: StackdriverDatasource;
   defaultProject: string;
   metricType: string;
   children?: (renderProps: any) => JSX.Element;
diff --git a/public/app/plugins/datasource/stackdriver/components/Project.tsx b/public/app/plugins/datasource/stackdriver/components/Project.tsx
index 65fd76884dc..8f3e1263ee3 100644
--- a/public/app/plugins/datasource/stackdriver/components/Project.tsx
+++ b/public/app/plugins/datasource/stackdriver/components/Project.tsx
@@ -1,7 +1,8 @@
 import React from 'react';
+import StackdriverDatasource from '../datasource';
 
 export interface Props {
-  datasource: any;
+  datasource: StackdriverDatasource;
 }
 
 interface State {
diff --git a/public/app/plugins/datasource/stackdriver/components/QueryEditor.test.tsx b/public/app/plugins/datasource/stackdriver/components/QueryEditor.test.tsx
index 8098433d83b..b4fc02fb24a 100644
--- a/public/app/plugins/datasource/stackdriver/components/QueryEditor.test.tsx
+++ b/public/app/plugins/datasource/stackdriver/components/QueryEditor.test.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import renderer from 'react-test-renderer';
 import { QueryEditor, Props, DefaultTarget } from './QueryEditor';
+import { TemplateSrv } from 'app/features/templating/template_srv';
 
 const props: Props = {
   onQueryChange: target => {},
@@ -8,10 +9,10 @@ const props: Props = {
   target: DefaultTarget,
   events: { on: () => {} },
   datasource: {
-    getDefaultProject: () => 'project',
-    getMetricTypes: () => [],
+    getDefaultProject: () => Promise.resolve('project'),
+    getMetricTypes: () => Promise.resolve([]),
   },
-  templateSrv: { variables: [] },
+  templateSrv: new TemplateSrv(),
 };
 
 describe('QueryEditor', () => {
diff --git a/public/app/plugins/datasource/stackdriver/components/QueryEditor.tsx b/public/app/plugins/datasource/stackdriver/components/QueryEditor.tsx
index 3d3f12ec57d..6710fd6146c 100644
--- a/public/app/plugins/datasource/stackdriver/components/QueryEditor.tsx
+++ b/public/app/plugins/datasource/stackdriver/components/QueryEditor.tsx
@@ -1,6 +1,8 @@
 import React from 'react';
 import _ from 'lodash';
 
+import { TemplateSrv } from 'app/features/templating/template_srv';
+
 import { Metrics } from './Metrics';
 import { Filter } from './Filter';
 import { Aggregations } from './Aggregations';
@@ -17,7 +19,7 @@ export interface Props {
   target: Target;
   events: any;
   datasource: any;
-  templateSrv: any;
+  templateSrv: TemplateSrv;
 }
 
 interface State extends Target {