diff --git a/.bra.toml b/.bra.toml
index 9c1fcda72e1..e832e9beee5 100644
--- a/.bra.toml
+++ b/.bra.toml
@@ -1,7 +1,7 @@
 [run]
 init_cmds = [
-  ["go", "build", "-o", "./bin/grafana-server.exe"],
-	["./bin/grafana-server.exe"]
+  ["go", "build", "-o", "./bin/grafana-server"],
+	["./bin/grafana-server"]
 ]
 watch_all = true
 watch_dirs = [
@@ -12,6 +12,6 @@ watch_dirs = [
 watch_exts = [".go", ".ini"]
 build_delay = 1500
 cmds = [
-  ["go", "build", "-o", "./bin/grafana-server.exe"],
-	["./bin/grafana-server.exe"]
+  ["go", "build", "-o", "./bin/grafana-server"],
+	["./bin/grafana-server"]
 ]
diff --git a/appveyor.yml b/appveyor.yml
index 754ba274d14..24b8f3a66dc 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -12,7 +12,7 @@ install:
   - echo %GOPATH%
   - go version
   - go env
-  - go get -v -t ./...
+  - go run build.go setup
 
 build_script:
-  - go test -v ./pkg/...
+  - go run build.go build