diff --git a/circle.yml b/circle.yml
index cab3c64a27f..8380bc2a2ff 100644
--- a/circle.yml
+++ b/circle.yml
@@ -32,7 +32,8 @@ dependencies:
 
 test:
   override:
-    - bash scripts/circle-test.sh
+    - bash scripts/circle-test-frontend.sh
+    - bash scripts/circle-test-backend.sh
 
 deployment:
   gh_branch:
diff --git a/pkg/api/alerting.go b/pkg/api/alerting.go
index 58ea56cc8a7..c01c8b24446 100644
--- a/pkg/api/alerting.go
+++ b/pkg/api/alerting.go
@@ -22,7 +22,8 @@ func ValidateOrgAlert(c *middleware.Context) {
 	if c.OrgId != query.Result.OrgId {
 		c.JsonApiErr(403, "You are not allowed to edit/view alert", nil)
 		return
-	}
+		}
+
 }
 
 func GetAlertStatesForDashboard(c *middleware.Context) Response {
diff --git a/scripts/circle-test.sh b/scripts/circle-test-backend.sh
similarity index 59%
rename from scripts/circle-test.sh
rename to scripts/circle-test-backend.sh
index e8b3195bee4..4e639f82007 100755
--- a/scripts/circle-test.sh
+++ b/scripts/circle-test-backend.sh
@@ -12,36 +12,22 @@ function exit_if_fail {
 
 cd /home/ubuntu/.go_workspace/src/github.com/grafana/grafana
 
-rm -rf node_modules
-npm install -g yarn --quiet
-yarn install --pure-lockfile --no-progress
-
-exit_if_fail npm run test:coverage
-exit_if_fail npm run build
-
-# publish code coverage
-echo "Publishing javascript code coverage"
-bash <(curl -s https://codecov.io/bash) -cF javascript
-rm -rf coverage
-# npm install -g codecov
-# codecov
-# cat ./coverage/lcov.info | node ./node_modules/coveralls/bin/coveralls.js
-
 echo "running go fmt"
 exit_if_fail test -z "$(gofmt -s -l ./pkg | tee /dev/stderr)"
 
 echo "running go vet"
 exit_if_fail test -z "$(go vet ./pkg/... | tee /dev/stderr)"
 
-echo "building binaries"
-exit_if_fail go run build.go build
+cd ~/dev/go/src/github.com/grafana/grafana
+echo "building backend with install to cache pkgs"
+exit_if_fail time go install ./pkg/cmd/grafana-server
 
 echo "running go test"
 
 set -e
 echo "" > coverage.txt
 
-for d in $(go list ./pkg/...); do
+time for d in $(go list ./pkg/...); do
   exit_if_fail go test -coverprofile=profile.out -covermode=atomic $d
   if [ -f profile.out ]; then
     cat profile.out >> coverage.txt
diff --git a/scripts/circle-test-frontend.sh b/scripts/circle-test-frontend.sh
new file mode 100755
index 00000000000..6a8684b4006
--- /dev/null
+++ b/scripts/circle-test-frontend.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+function exit_if_fail {
+    command=$@
+    echo "Executing '$command'"
+    eval $command
+    rc=$?
+    if [ $rc -ne 0 ]; then
+        echo "'$command' returned $rc."
+        exit $rc
+    fi
+}
+
+cd /home/ubuntu/.go_workspace/src/github.com/grafana/grafana
+
+rm -rf node_modules
+npm install -g yarn --quiet
+yarn install --pure-lockfile --no-progress
+
+exit_if_fail npm run test:coverage
+exit_if_fail npm run build
+
+# publish code coverage
+echo "Publishing javascript code coverage"
+bash <(curl -s https://codecov.io/bash) -cF javascript
+rm -rf coverage
diff --git a/scripts/grunt/options/exec.js b/scripts/grunt/options/exec.js
index cf18adfca8c..b4ae6ada6e1 100644
--- a/scripts/grunt/options/exec.js
+++ b/scripts/grunt/options/exec.js
@@ -1,5 +1,5 @@
 module.exports = function(config, grunt) {
-  'use strict'
+  'use strict';
 
   var coverage = '';
   if (config.coverage) {
@@ -7,8 +7,8 @@ module.exports = function(config, grunt) {
   }
 
   return {
-    tslint:     "node ./node_modules/tslint/lib/tslint-cli.js -c tslint.json --project ./tsconfig.json",
-    jest:       "node ./node_modules/jest-cli/bin/jest.js " + coverage,
-    "webpack":  "./node_modules/.bin/webpack --config scripts/webpack/webpack.prod.js",
+    tslint: 'node ./node_modules/tslint/lib/tslint-cli.js -c tslint.json --project ./tsconfig.json',
+    jest: 'node ./node_modules/jest-cli/bin/jest.js ' + coverage,
+    webpack: './node_modules/.bin/webpack --config scripts/webpack/webpack.prod.js',
   };
 };