diff --git a/pkg/tsdb/stackdriver/ensure_default_project.go b/pkg/tsdb/stackdriver/ensure_default_project.go
new file mode 100644
index 00000000000..265fdda5151
--- /dev/null
+++ b/pkg/tsdb/stackdriver/ensure_default_project.go
@@ -0,0 +1,24 @@
+package stackdriver
+
+import (
+	"context"
+
+	"github.com/grafana/grafana/pkg/components/simplejson"
+	"github.com/grafana/grafana/pkg/tsdb"
+)
+
+func (e *StackdriverExecutor) ensureDefaultProject(ctx context.Context, tsdbQuery *tsdb.TsdbQuery) (*tsdb.Response, error) {
+	queryResult := &tsdb.QueryResult{Meta: simplejson.New(), RefId: tsdbQuery.Queries[0].RefId}
+	result := &tsdb.Response{
+		Results: make(map[string]*tsdb.QueryResult),
+	}
+	defaultProject, err := e.getDefaultProject(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	e.dsInfo.JsonData.Set("defaultProject", defaultProject)
+	queryResult.Meta.Set("defaultProject", defaultProject)
+	result.Results[tsdbQuery.Queries[0].RefId] = queryResult
+	return result, nil
+}
diff --git a/pkg/tsdb/stackdriver/stackdriver.go b/pkg/tsdb/stackdriver/stackdriver.go
index db8c2a0e501..ad5dded38b2 100644
--- a/pkg/tsdb/stackdriver/stackdriver.go
+++ b/pkg/tsdb/stackdriver/stackdriver.go
@@ -77,10 +77,8 @@ func (e *StackdriverExecutor) Query(ctx context.Context, dsInfo *models.DataSour
 	switch queryType {
 	case "annotationQuery":
 		result, err = e.executeAnnotationQuery(ctx, tsdbQuery)
-	case "testDatasource":
-		result, err = e.executeTestDataSource(ctx, tsdbQuery)
-	case "defaultProject":
-		result, err = e.getGceDefaultProject(ctx, tsdbQuery)
+	case "ensureDefaultProjectQuery":
+		result, err = e.ensureDefaultProject(ctx, tsdbQuery)
 	case "timeSeriesQuery":
 		fallthrough
 	default:
diff --git a/pkg/tsdb/stackdriver/test_datasource_query.go b/pkg/tsdb/stackdriver/test_datasource_query.go
deleted file mode 100644
index c5968b6a081..00000000000
--- a/pkg/tsdb/stackdriver/test_datasource_query.go
+++ /dev/null
@@ -1,94 +0,0 @@
-package stackdriver
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"golang.org/x/net/context/ctxhttp"
-
-	"github.com/grafana/grafana/pkg/tsdb"
-)
-
-func (e *StackdriverExecutor) executeTestDataSource(ctx context.Context, tsdbQuery *tsdb.TsdbQuery) (*tsdb.Response, error) {
-	queryResult := &tsdb.QueryResult{Meta: simplejson.New(), RefId: tsdbQuery.Queries[0].RefId}
-	result := &tsdb.Response{
-		Results: make(map[string]*tsdb.QueryResult),
-	}
-
-	authenticationType := e.dsInfo.JsonData.Get("authenticationType").MustString(jwtAuthentication)
-	if authenticationType == gceAuthentication {
-		defaultProject, err := e.getDefaultProject(ctx)
-		if err != nil {
-			return nil, fmt.Errorf("Failed to retrieve default project from GCE metadata server. error: %v", err)
-		}
-
-		e.dsInfo.JsonData.Set("defaultProject", defaultProject)
-	}
-
-	req, err := e.createRequest(ctx, e.dsInfo, "metricDescriptors")
-	if err != nil {
-		slog.Error("Failed to create request", "error", err)
-		return nil, fmt.Errorf("Failed to create request. error: %v", err)
-	}
-	res, err := ctxhttp.Do(ctx, e.httpClient, req)
-	if err != nil {
-		return nil, err
-	}
-
-	data, err := e.unmarshalMetricDescriptors(res)
-	if err != nil {
-		return nil, err
-	}
-
-	parts := strings.Split(req.URL.Path, "/")
-	defaultProject := parts[3]
-
-	table := transformMetricDescriptorResponseToTable(data)
-	queryResult.Tables = append(queryResult.Tables, table)
-	result.Results[tsdbQuery.Queries[0].RefId] = queryResult
-	result.Results[tsdbQuery.Queries[0].RefId].Meta.Set("defaultProject", defaultProject)
-
-	return result, nil
-}
-
-func transformMetricDescriptorResponseToTable(data MetricDescriptorsResponse) *tsdb.Table {
-	table := &tsdb.Table{
-		Columns: make([]tsdb.TableColumn, 1),
-		Rows:    make([]tsdb.RowValues, 0),
-	}
-	table.Columns[0].Text = "metricDescriptor"
-
-	for _, r := range data.MetricDescriptors {
-		values := make([]interface{}, 1)
-		values[0] = r
-		table.Rows = append(table.Rows, values)
-	}
-	return table
-}
-
-func (e *StackdriverExecutor) unmarshalMetricDescriptors(res *http.Response) (MetricDescriptorsResponse, error) {
-	body, err := ioutil.ReadAll(res.Body)
-	defer res.Body.Close()
-	if err != nil {
-		return MetricDescriptorsResponse{}, err
-	}
-
-	if res.StatusCode/100 != 2 {
-		slog.Error("Request failed", "status", res.Status, "body", string(body))
-		return MetricDescriptorsResponse{}, fmt.Errorf(`%s`, string(body))
-	}
-
-	var data MetricDescriptorsResponse
-	err = json.Unmarshal(body, &data)
-	if err != nil {
-		slog.Error("Failed to unmarshal MetricDescriptorResponse", "error", err, "status", res.Status, "body", string(body))
-		return MetricDescriptorsResponse{}, err
-	}
-
-	return data, nil
-}