diff --git a/.bra.toml b/.bra.toml
index e832e9beee5..9c1fcda72e1 100644
--- a/.bra.toml
+++ b/.bra.toml
@@ -1,7 +1,7 @@
 [run]
 init_cmds = [
-  ["go", "build", "-o", "./bin/grafana-server"],
-	["./bin/grafana-server"]
+  ["go", "build", "-o", "./bin/grafana-server.exe"],
+	["./bin/grafana-server.exe"]
 ]
 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"],
-	["./bin/grafana-server"]
+  ["go", "build", "-o", "./bin/grafana-server.exe"],
+	["./bin/grafana-server.exe"]
 ]
diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 00000000000..754ba274d14
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,18 @@
+version: "{build}"
+
+os: Windows Server 2012 R2
+
+clone_folder: c:\gopath\src\github.com\grafana\grafana
+
+environment:
+  GOPATH: c:\gopath
+
+install:
+  - echo %PATH%
+  - echo %GOPATH%
+  - go version
+  - go env
+  - go get -v -t ./...
+
+build_script:
+  - go test -v ./pkg/...