diff --git a/pkg/services/sqlstore/sqlstore.go b/pkg/services/sqlstore/sqlstore.go
index 9217d6c32ec..221edc51155 100644
--- a/pkg/services/sqlstore/sqlstore.go
+++ b/pkg/services/sqlstore/sqlstore.go
@@ -14,16 +14,16 @@ import (
 	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
 	"github.com/grafana/grafana/pkg/setting"
 
+	"github.com/go-sql-driver/mysql"
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/go-xorm/xorm"
 	_ "github.com/lib/pq"
 	_ "github.com/mattn/go-sqlite3"
-	"github.com/go-sql-driver/mysql"
 )
 
 type MySQLConfig struct {
-	SslMode string
-	CaCertPath string
+	SslMode        string
+	CaCertPath     string
 	ClientKeyPath  string
 	ClientCertPath string
 	ServerCertName string
diff --git a/pkg/services/sqlstore/tls_mysql.go b/pkg/services/sqlstore/tls_mysql.go
index f5c25a63149..fb55eb401c9 100644
--- a/pkg/services/sqlstore/tls_mysql.go
+++ b/pkg/services/sqlstore/tls_mysql.go
@@ -17,7 +17,7 @@ func makeCert(tlsPoolName string, config MySQLConfig) (*tls.Config, error) {
 		return nil, err
 	}
 	clientCert := make([]tls.Certificate, 0, 1)
-	if (config.ClientCertPath != "" && config.ClientKeyPath != "") {
+	if config.ClientCertPath != "" && config.ClientKeyPath != "" {
 
 		certs, err := tls.LoadX509KeyPair(config.ClientCertPath, config.ClientKeyPath)
 		if err != nil {
@@ -34,7 +34,7 @@ func makeCert(tlsPoolName string, config MySQLConfig) (*tls.Config, error) {
 		tlsConfig.InsecureSkipVerify = true
 	}
 	// Return more meaningful error before it is too late
-	if config.ServerCertName == "" && !tlsConfig.InsecureSkipVerify{
+	if config.ServerCertName == "" && !tlsConfig.InsecureSkipVerify {
 		return nil, fmt.Errorf("server_cert_name is missing. Consider using ssl_mode = skip-verify.")
 	}
 	return tlsConfig, nil