diff --git a/Makefile b/Makefile
index 5f6a16580..6e29e4235 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,6 @@ setup:
 	go get -u golang.org/x/tools/cmd/stringer
 	go get -u github.com/alecthomas/gometalinter
 	go get -u github.com/golang/dep/cmd/dep
-	go get -u github.com/pierrre/gotestcover
 	go get -u golang.org/x/tools/cmd/cover
 	go get -u github.com/caarlos0/static/cmd/static-docs
 	go get -u github.com/caarlos0/bandep
@@ -23,7 +22,7 @@ check:
 
 # Run all the tests
 test:
-	gotestcover $(TEST_OPTIONS) -covermode=atomic -coverprofile=coverage.txt $(SOURCE_FILES) -run $(TEST_PATTERN) -timeout=2m
+	go test $(TEST_OPTIONS) -failfast -race -coverpkg=./... -covermode=atomic -coverprofile=coverage.txt $(SOURCE_FILES) -run $(TEST_PATTERN) -timeout=2m
 .PHONY: cover
 
 # Run all the tests and opens the coverage report
diff --git a/pipeline/release/release_test.go b/pipeline/release/release_test.go
index 50759a7a4..e2dad8add 100644
--- a/pipeline/release/release_test.go
+++ b/pipeline/release/release_test.go
@@ -6,6 +6,7 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
+	"sync"
 	"testing"
 
 	"github.com/goreleaser/goreleaser/config"
@@ -201,6 +202,7 @@ type DummyClient struct {
 	CreatedRelease      bool
 	UploadedFile        bool
 	UploadedFileNames   []string
+	Lock                sync.Mutex
 }
 
 func (client *DummyClient) CreateRelease(ctx *context.Context, body string) (releaseID int64, err error) {
@@ -216,6 +218,8 @@ func (client *DummyClient) CreateFile(ctx *context.Context, commitAuthor config.
 }
 
 func (client *DummyClient) Upload(ctx *context.Context, releaseID int64, name string, file *os.File) (err error) {
+	client.Lock.Lock()
+	defer client.Lock.Unlock()
 	if client.FailToUpload {
 		return errors.New("upload failed")
 	}