diff --git a/Makefile b/Makefile
index 00e051c8..806bbaad 100644
--- a/Makefile
+++ b/Makefile
@@ -14,6 +14,9 @@ build-debug: .bin-image
 test: .bin-image
 	docker run -t --rm -e PACKAGER=$(PACKAGER) -v $(CURDIR):/src $(BIN_IMAGE) make test
 
+test-all: .bin-image
+	docker run -t --rm -e PACKAGER=$(PACKAGER) -v $(CURDIR):/src $(BIN_IMAGE) make test-all
+
 deb: .deb-image
 	docker run -t --rm -e PACKAGER=$(PACKAGER) -v $(CURDIR):/src -v $(CURDIR)/build:/out $(DEB_IMAGE)
 
diff --git a/build/bin/Makefile b/build/bin/Makefile
index 7d4efd84..932285c9 100644
--- a/build/bin/Makefile
+++ b/build/bin/Makefile
@@ -9,9 +9,13 @@ build-debug: prepare-sources
 	chown $(PACKAGER) /out/blockbook
 
 test: prepare-sources
-	cd $(GOPATH)/src/blockbook && go test -v ./...
+	cd $(GOPATH)/src/blockbook && go test -short ./...
+
+test-all: prepare-sources
+	cd $(GOPATH)/src/blockbook && go test ./...
 
 prepare-sources:
 	@ [ -n "`ls /src 2> /dev/null`" ] || (echo "/src doesn't exist or is empty" 1>&2 && exit 1)
 	cp -r /src $(GOPATH)/src/blockbook
+	rm -rf $(GOPATH)/src/blockbook/vendor
 	cd $(GOPATH)/src/blockbook && dep ensure -vendor-only