diff --git a/.travis.yml b/.travis.yml
index 52929c1a2..3165b0fcf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,12 +15,11 @@ go:
 
 install:
  - go get ./...
- - go get -u github.com/golang/lint/golint
+ - go get -u github.com/kisielk/errcheck
  - go get -u golang.org/x/tools/cmd/goimports
+ - go get -u github.com/golang/lint/golint
 
 script:
-  - go vet ./...
-  - diff <(goimports -d .) <(printf "")
-  - diff <(golint ./...) <(printf "")
+  - make check
   - go test -v ./...
   - go test -cpu=2 -race -v ./...
diff --git a/Makefile b/Makefile
index 42c91a7cd..b158fbbe3 100644
--- a/Makefile
+++ b/Makefile
@@ -14,8 +14,8 @@ test:	rclone
 check:	rclone
 	go vet ./...
 	errcheck ./...
-	golint ./...
-	diff <(goimports -d .) <(printf "")
+	goimports -d . | grep . ; test $$? -eq 1
+	golint ./... | grep -E -v '(StorageUrl|CdnUrl)' ; test $$? -eq 1
 
 doc:	rclone.1 MANUAL.html MANUAL.txt