diff --git a/.travis.yml b/.travis.yml
index 9d4da63cb..5bb814298 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,10 +29,10 @@ install:
 
 before_script:
 - find . -name "*.go" | xargs gofmt -w
-- git diff --exit-code
+- git diff --name-only --exit-code || exit 1
 
 script:
-- GOARCH=386 go test -v ./...
+- GOARCH=386 go test -v ./... || exit 1
 - GOARCH=amd64 go test -v ./... -race -coverprofile=coverage.txt -covermode=atomic
 
 after_success: