diff --git a/pkg/tsdb/stackdriver/stackdriver_test.go b/pkg/tsdb/stackdriver/stackdriver_test.go
index 28aeef2b153..f51697b17b5 100644
--- a/pkg/tsdb/stackdriver/stackdriver_test.go
+++ b/pkg/tsdb/stackdriver/stackdriver_test.go
@@ -68,7 +68,7 @@ func TestStackdriver(t *testing.T) {
 			})
 
 			Convey("and alignmentPeriod is set to grafana-auto", func() {
-				Convey("and IntervalMs is larger than 60", func() {
+				Convey("and IntervalMs is larger than 60000", func() {
 					tsdbQuery.Queries[0].IntervalMs = 1000000
 					tsdbQuery.Queries[0].Model = simplejson.NewFromAny(map[string]interface{}{
 						"target":          "target",
@@ -80,8 +80,8 @@ func TestStackdriver(t *testing.T) {
 					So(err, ShouldBeNil)
 					So(queries[0].Params["aggregation.alignmentPeriod"][0], ShouldEqual, `+1000s`)
 				})
-				Convey("and IntervalMs is less than 60", func() {
-					tsdbQuery.Queries[0].IntervalMs = 30
+				Convey("and IntervalMs is less than 60000", func() {
+					tsdbQuery.Queries[0].IntervalMs = 30000
 					tsdbQuery.Queries[0].Model = simplejson.NewFromAny(map[string]interface{}{
 						"target":          "target",
 						"alignmentPeriod": "grafana-auto",