diff --git a/.travis.yml b/.travis.yml
index 1a72afff62..3111b9ee1d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,8 +7,7 @@ branches:
   only:
     - master
 
-install: make
 script:
-  - make test
+  - make ci
 
 sudo: false
diff --git a/GNUmakefile b/GNUmakefile
index a11af8532a..a822e0246a 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -10,7 +10,15 @@ VETARGS?=-asmdecl -atomic -bool -buildtags -copylocks -methods \
 VERSION?=$(shell awk -F\" '/^const Version/ { print $$2; exit }' version.go)
 
 # all builds binaries for all targets
-all: tools
+all: bin
+
+ci:
+	if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then \
+		$(MAKE) bin ;\
+	fi
+	@$(MAKE) test
+
+bin: tools
 	@mkdir -p bin/
 	@sh -c "'$(CURDIR)/scripts/build.sh'"
 
@@ -61,4 +69,4 @@ static-assets:
 tools:
 	go get -u -v $(GOTOOLS)
 
-.PHONY: all bin dev dist cov test cover format vet static-assets tools
+.PHONY: all ci bin dev dist cov test cover format vet static-assets tools