diff --git a/public/app/plugins/datasource/cloudwatch/datasource.js b/public/app/plugins/datasource/cloudwatch/datasource.js
index 23662cddb93..ac4573ef43a 100644
--- a/public/app/plugins/datasource/cloudwatch/datasource.js
+++ b/public/app/plugins/datasource/cloudwatch/datasource.js
@@ -333,7 +333,7 @@ function (angular, _, moment, dateMath, kbn, templatingVariable) {
       };
 
       return backendSrv.datasourceRequest(options).then(function(result) {
-        return result;
+        return result.data;
       });
     };
 
diff --git a/public/app/plugins/datasource/cloudwatch/specs/datasource_specs.ts b/public/app/plugins/datasource/cloudwatch/specs/datasource_specs.ts
index 5d6d9ee5f51..f278ce9305d 100644
--- a/public/app/plugins/datasource/cloudwatch/specs/datasource_specs.ts
+++ b/public/app/plugins/datasource/cloudwatch/specs/datasource_specs.ts
@@ -68,7 +68,7 @@ describe('CloudWatchDatasource', function() {
     beforeEach(function() {
       ctx.backendSrv.datasourceRequest = function(params) {
         requestParams = params.data;
-        return ctx.$q.when(response);
+        return ctx.$q.when({data: response});
       };
     });
 
@@ -213,7 +213,7 @@ describe('CloudWatchDatasource', function() {
     beforeEach(function() {
       ctx.backendSrv.datasourceRequest = function(params) {
         requestParams = params.data;
-        return ctx.$q.when(response);
+        return ctx.$q.when({data: response});
       };
     });
 
@@ -235,7 +235,7 @@ describe('CloudWatchDatasource', function() {
           setupCallback();
           ctx.backendSrv.datasourceRequest = args => {
             scenario.request = args.data;
-            return ctx.$q.when(scenario.requestResponse);
+            return ctx.$q.when({data: scenario.requestResponse});
           };
           ctx.ds.metricFindQuery(query).then(args => {
             scenario.result = args;