diff --git a/.travis.yml b/.travis.yml
index 32b2a3fac..a86033d84 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,9 @@ before_install:
 - make
 - export PATH=$PATH:`pwd`
 - cd ..
+script:
+- make test
+- make test GOFLAGS="-race"
 sudo: false
 go:
 - 1.5.1
diff --git a/Makefile b/Makefile
index 9c4cd9885..cb4d0c1d9 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,10 @@ cyclo:
 build: getdeps verifiers
 	@echo "Installing minio:"
 	@GO15VENDOREXPERIMENT=1 go generate ./...
-	@GO15VENDOREXPERIMENT=1 go test -race github.com/minio/minio/pkg...
+
+test: build
+	@echo "Running all testing:"
+	@GO15VENDOREXPERIMENT=1 go test $(GOFLAGS) github.com/minio/minio/pkg...
 
 gomake-all: build
 	@GO15VENDOREXPERIMENT=1 go install github.com/minio/minio