diff --git a/pkg/services/alerting/eval_handler_test.go b/pkg/services/alerting/eval_handler_test.go
index 82cc5d43baf..cf6422a5250 100644
--- a/pkg/services/alerting/eval_handler_test.go
+++ b/pkg/services/alerting/eval_handler_test.go
@@ -39,7 +39,7 @@ func TestAlertingEvaluationHandler(t *testing.T) {
 		Convey("Show return false with not passing asdf", func() {
 			context := NewEvalContext(context.TODO(), &Rule{
 				Conditions: []Condition{
-					&conditionStub{firing: true, operator: "and", matches: []*EvalMatch{&EvalMatch{}, &EvalMatch{}}},
+					&conditionStub{firing: true, operator: "and", matches: []*EvalMatch{{}, {}}},
 					&conditionStub{firing: false, operator: "and"},
 				},
 			})
diff --git a/pkg/services/alerting/notifiers/line.go b/pkg/services/alerting/notifiers/line.go
index bf15c497f2c..0f544cbdfb6 100644
--- a/pkg/services/alerting/notifiers/line.go
+++ b/pkg/services/alerting/notifiers/line.go
@@ -1,21 +1,21 @@
 package notifiers
 
 import (
-	"github.com/grafana/grafana/pkg/log"
-	"github.com/grafana/grafana/pkg/services/alerting"
-	m "github.com/grafana/grafana/pkg/models"
-	"github.com/grafana/grafana/pkg/metrics"
-	"net/url"
 	"fmt"
 	"github.com/grafana/grafana/pkg/bus"
+	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/metrics"
+	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/services/alerting"
+	"net/url"
 )
 
 func init() {
 	alerting.RegisterNotifier(&alerting.NotifierPlugin{
-		Type: "LINE",
-		Name: "LINE",
+		Type:        "LINE",
+		Name:        "LINE",
 		Description: "Send notifications to LINE notify",
-		Factory: NewLINENotifier,
+		Factory:     NewLINENotifier,
 		OptionsTemplate: `
     <div class="gf-form-group">
       <h3 class="page-heading">LINE notify settings</h3>
diff --git a/pkg/services/alerting/notifiers/line_test.go b/pkg/services/alerting/notifiers/line_test.go
index 8d11cc6e1bf..6630665e992 100644
--- a/pkg/services/alerting/notifiers/line_test.go
+++ b/pkg/services/alerting/notifiers/line_test.go
@@ -1,4 +1,3 @@
-
 package notifiers
 
 import (
diff --git a/pkg/services/sqlstore/alert.go b/pkg/services/sqlstore/alert.go
index 703a3fe34b8..66f3b5b7250 100644
--- a/pkg/services/sqlstore/alert.go
+++ b/pkg/services/sqlstore/alert.go
@@ -113,7 +113,7 @@ func HandleAlertsQuery(query *m.GetAlertsQuery) error {
 		return err
 	}
 
-	for i, _ := range alerts {
+	for i := range alerts {
 		if alerts[i].ExecutionError == " " {
 			alerts[i].ExecutionError = ""
 		}
diff --git a/pkg/tsdb/influxdb/query_test.go b/pkg/tsdb/influxdb/query_test.go
index dd2a3a5687a..533df27f91f 100644
--- a/pkg/tsdb/influxdb/query_test.go
+++ b/pkg/tsdb/influxdb/query_test.go
@@ -128,43 +128,43 @@ func TestInfluxdbQueryBuilder(t *testing.T) {
 		})
 
 		Convey("can render normal tags without operator", func() {
-			query := &Query{Tags: []*Tag{&Tag{Operator: "", Value: `value`, Key: "key"}}}
+			query := &Query{Tags: []*Tag{{Operator: "", Value: `value`, Key: "key"}}}
 
 			So(strings.Join(query.renderTags(), ""), ShouldEqual, `"key" = 'value'`)
 		})
 
 		Convey("can render regex tags without operator", func() {
-			query := &Query{Tags: []*Tag{&Tag{Operator: "", Value: `/value/`, Key: "key"}}}
+			query := &Query{Tags: []*Tag{{Operator: "", Value: `/value/`, Key: "key"}}}
 
 			So(strings.Join(query.renderTags(), ""), ShouldEqual, `"key" =~ /value/`)
 		})
 
 		Convey("can render regex tags", func() {
-			query := &Query{Tags: []*Tag{&Tag{Operator: "=~", Value: `/value/`, Key: "key"}}}
+			query := &Query{Tags: []*Tag{{Operator: "=~", Value: `/value/`, Key: "key"}}}
 
 			So(strings.Join(query.renderTags(), ""), ShouldEqual, `"key" =~ /value/`)
 		})
 
 		Convey("can render number tags", func() {
-			query := &Query{Tags: []*Tag{&Tag{Operator: "=", Value: "10001", Key: "key"}}}
+			query := &Query{Tags: []*Tag{{Operator: "=", Value: "10001", Key: "key"}}}
 
 			So(strings.Join(query.renderTags(), ""), ShouldEqual, `"key" = '10001'`)
 		})
 
 		Convey("can render numbers less then condition tags", func() {
-			query := &Query{Tags: []*Tag{&Tag{Operator: "<", Value: "10001", Key: "key"}}}
+			query := &Query{Tags: []*Tag{{Operator: "<", Value: "10001", Key: "key"}}}
 
 			So(strings.Join(query.renderTags(), ""), ShouldEqual, `"key" < 10001`)
 		})
 
 		Convey("can render number greather then condition tags", func() {
-			query := &Query{Tags: []*Tag{&Tag{Operator: ">", Value: "10001", Key: "key"}}}
+			query := &Query{Tags: []*Tag{{Operator: ">", Value: "10001", Key: "key"}}}
 
 			So(strings.Join(query.renderTags(), ""), ShouldEqual, `"key" > 10001`)
 		})
 
 		Convey("can render string tags", func() {
-			query := &Query{Tags: []*Tag{&Tag{Operator: "=", Value: "value", Key: "key"}}}
+			query := &Query{Tags: []*Tag{{Operator: "=", Value: "value", Key: "key"}}}
 
 			So(strings.Join(query.renderTags(), ""), ShouldEqual, `"key" = 'value'`)
 		})
diff --git a/pkg/tsdb/influxdb/response_parser_test.go b/pkg/tsdb/influxdb/response_parser_test.go
index 67667f565d5..a517cf4d71f 100644
--- a/pkg/tsdb/influxdb/response_parser_test.go
+++ b/pkg/tsdb/influxdb/response_parser_test.go
@@ -19,7 +19,7 @@ func TestInfluxdbResponseParser(t *testing.T) {
 
 			response := &Response{
 				Results: []Result{
-					Result{
+					{
 						Series: []Row{
 							{
 								Name:    "cpu",
@@ -69,7 +69,7 @@ func TestInfluxdbResponseParser(t *testing.T) {
 
 			response := &Response{
 				Results: []Result{
-					Result{
+					{
 						Series: []Row{
 							{
 								Name:    "cpu.upc",
diff --git a/pkg/tsdb/mqe/types_test.go b/pkg/tsdb/mqe/types_test.go
index 1138e0599e7..fccd6709bd4 100644
--- a/pkg/tsdb/mqe/types_test.go
+++ b/pkg/tsdb/mqe/types_test.go
@@ -27,16 +27,16 @@ func TestWildcardExpansion(t *testing.T) {
 		Convey("Without wildcard series", func() {
 			query := &Query{
 				Metrics: []Metric{
-					Metric{Metric: "os.cpu.3.idle", Alias: ""},
-					Metric{Metric: "os.cpu.2.idle", Alias: ""},
-					Metric{Metric: "os.cpu.1.idle", Alias: "cpu"},
+					{Metric: "os.cpu.3.idle", Alias: ""},
+					{Metric: "os.cpu.2.idle", Alias: ""},
+					{Metric: "os.cpu.1.idle", Alias: "cpu"},
 				},
 				Hosts:             []string{"staples-lab-1", "staples-lab-2"},
 				Cluster:           []string{"demoapp-1", "demoapp-2"},
 				AddClusterToAlias: false,
 				AddHostToAlias:    false,
 				FunctionList: []Function{
-					Function{Func: "aggregate.min"},
+					{Func: "aggregate.min"},
 				},
 				TimeRange: &tsdb.TimeRange{Now: now, From: "5m", To: "now"},
 			}
@@ -52,15 +52,15 @@ func TestWildcardExpansion(t *testing.T) {
 		Convey("With two aggregate functions", func() {
 			query := &Query{
 				Metrics: []Metric{
-					Metric{Metric: "os.cpu.3.idle", Alias: ""},
+					{Metric: "os.cpu.3.idle", Alias: ""},
 				},
 				Hosts:             []string{"staples-lab-1", "staples-lab-2"},
 				Cluster:           []string{"demoapp-1", "demoapp-2"},
 				AddClusterToAlias: false,
 				AddHostToAlias:    false,
 				FunctionList: []Function{
-					Function{Func: "aggregate.min"},
-					Function{Func: "aggregate.max"},
+					{Func: "aggregate.min"},
+					{Func: "aggregate.max"},
 				},
 				TimeRange: &tsdb.TimeRange{Now: now, From: "5m", To: "now"},
 			}
@@ -74,7 +74,7 @@ func TestWildcardExpansion(t *testing.T) {
 		Convey("Containg wildcard series", func() {
 			query := &Query{
 				Metrics: []Metric{
-					Metric{Metric: "os.cpu*", Alias: ""},
+					{Metric: "os.cpu*", Alias: ""},
 				},
 				Hosts:             []string{"staples-lab-1"},
 				AddClusterToAlias: false,