diff --git a/.drone.yml b/.drone.yml
index 60ea41da..d943e19f 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,14 +1,28 @@
 image: dmp42/go:stable
 
 script:
+  # To be spoofed back into the test image
+  - go get github.com/modocache/gover
+
   - go get -t ./...
 
-  - FAIL=$(find ./ -iname "*.go" -exec gofmt -s -l {} \;) && echo "$FAIL" && test -z "$FAIL"
+  # Go fmt
+  - test -z "$(gofmt -s -l -w .     | tee /dev/stderr)"
+  # Go lint
+  - test -z "$(golint ./...          | tee /dev/stderr)"
+  # Go vet
   - go vet ./...
-  - FAIL=$(golint ./...) && echo "$FAIL" && test -z "$FAIL"
-  - go test -v ./...
-  - goveralls -v -service drone.io -repotoken {{COVERALLS_TOKEN}}
-  # - go build --tags SOMETAG
+  # Go test
+  - go test -v -race -cover ./...
+  # Helper to concatenate reports
+  - gover
+  # Send to coverall
+  - goveralls -service drone.io -coverprofile=gover.coverprofile -repotoken {{COVERALLS_TOKEN}}
+
+  # Do we want these as well?
+  # - go get code.google.com/p/go.tools/cmd/goimports
+  # - test -z "$(goimports -l -w ./... | tee /dev/stderr)"
+  # http://labix.org/gocheck
 
 notify:
     email:
diff --git a/project/dev-image/Dockerfile b/project/dev-image/Dockerfile
index f77af95c..017c1a21 100644
--- a/project/dev-image/Dockerfile
+++ b/project/dev-image/Dockerfile
@@ -6,6 +6,7 @@ ENV GOROOT /usr/local/go
 ENV PATH $PATH:$GOROOT/bin:$GOPATH/bin
 
 ENV LANG C
+ENG LC_ALL C
 
 RUN apt-get update && apt-get install -y \
   wget ca-certificates git mercurial bzr \
@@ -16,4 +17,4 @@ RUN wget https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz --quiet && \
   tar -C /usr/local -xzf go$GOLANG_VERSION.linux-amd64.tar.gz && \
   rm go${GOLANG_VERSION}.linux-amd64.tar.gz
 
-RUN go get github.com/axw/gocov/gocov github.com/mattn/goveralls github.com/golang/lint/golint
\ No newline at end of file
+RUN go get github.com/axw/gocov/gocov github.com/mattn/goveralls github.com/golang/lint/golint