diff --git a/pkg/services/sqlstore/alert_rule_test.go b/pkg/services/sqlstore/alert_rule_test.go
index 2ab839840ed..9a3b0088b5c 100644
--- a/pkg/services/sqlstore/alert_rule_test.go
+++ b/pkg/services/sqlstore/alert_rule_test.go
@@ -15,7 +15,7 @@ func TestAlertingDataAccess(t *testing.T) {
 		testDash := insertTestDashboard("dashboard with alerts", 1, "alert")
 
 		items := []*m.AlertRule{
-			&m.AlertRule{
+			{
 				PanelId:      1,
 				DashboardId:  testDash.Id,
 				OrgId:        testDash.OrgId,
@@ -117,19 +117,19 @@ func TestAlertingDataAccess(t *testing.T) {
 
 		Convey("Multiple alerts per dashboard", func() {
 			multipleItems := []*m.AlertRule{
-				&m.AlertRule{
+				{
 					DashboardId: testDash.Id,
 					PanelId:     1,
 					Query:       "1",
 					OrgId:       1,
 				},
-				&m.AlertRule{
+				{
 					DashboardId: testDash.Id,
 					PanelId:     2,
 					Query:       "2",
 					OrgId:       1,
 				},
-				&m.AlertRule{
+				{
 					DashboardId: testDash.Id,
 					PanelId:     3,
 					Query:       "3",
@@ -179,7 +179,7 @@ func TestAlertingDataAccess(t *testing.T) {
 
 		Convey("When dashboard is removed", func() {
 			items := []*m.AlertRule{
-				&m.AlertRule{
+				{
 					PanelId:      1,
 					DashboardId:  testDash.Id,
 					Query:        "Query",
diff --git a/pkg/services/sqlstore/alert_state_test.go b/pkg/services/sqlstore/alert_state_test.go
index 2389fc43a18..97a785eceac 100644
--- a/pkg/services/sqlstore/alert_state_test.go
+++ b/pkg/services/sqlstore/alert_state_test.go
@@ -14,7 +14,7 @@ func TestAlertingStateAccess(t *testing.T) {
 		testDash := insertTestDashboard("dashboard with alerts", 1, "alert")
 
 		items := []*m.AlertRule{
-			&m.AlertRule{
+			{
 				PanelId:      1,
 				DashboardId:  testDash.Id,
 				OrgId:        testDash.OrgId,
diff --git a/pkg/services/sqlstore/dashboard_parser_test.go b/pkg/services/sqlstore/dashboard_parser_test.go
index 331e9f58478..7dc508c50f2 100644
--- a/pkg/services/sqlstore/dashboard_parser_test.go
+++ b/pkg/services/sqlstore/dashboard_parser_test.go
@@ -108,7 +108,7 @@ func TestAlertModel(t *testing.T) {
             "warnOperator": ">",
             "critOperator": ">",
             "aggregator": "sum",
-            "queryRange": "10m",
+            "queryRange": 3600,
             "frequency": 10,
             "name": "active desktop users",
             "description": "restart webservers"
@@ -195,9 +195,9 @@ func TestAlertModel(t *testing.T) {
             "warnLevel": 300,
             "critLevel": 500,
             "aggregator": "avg",
-            "queryRange": "10m",
+            "queryRange": 3600,
             "frequency": 10,
-            "title": "active mobile users",
+            "name": "active mobile users",
             "description": "restart itunes"
           },
           "links": []
@@ -385,7 +385,8 @@ func TestAlertModel(t *testing.T) {
 				So(v.Aggregator, ShouldNotBeEmpty)
 				So(v.Query, ShouldNotBeEmpty)
 				So(v.QueryRefId, ShouldNotBeEmpty)
-				So(v.QueryRange, ShouldNotBeEmpty)
+				So(v.QueryRange, ShouldNotEqual, 0)
+				So(v.Frequency, ShouldNotEqual, 0)
 				So(v.Name, ShouldNotBeEmpty)
 				So(v.Description, ShouldNotBeEmpty)
 			}