diff --git a/Makefile b/Makefile
index 7d2d23ad6..5cc907230 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,4 @@
 PACKAGES=$(shell go list ./... | grep -v '/vendor/')
-PACKAGES_NOCLITEST=$(shell go list ./... | grep -v '/vendor/' | grep -v github.com/cosmos/cosmos-sdk/cmd/gaia/cli_test)
 COMMIT_HASH := $(shell git rev-parse --short HEAD)
 BUILD_FLAGS = -ldflags "-X github.com/cosmos/cosmos-sdk/version.GitCommit=${COMMIT_HASH}"
 
@@ -86,11 +85,11 @@ godocs:
 
 test: test_unit
 
-test_cli: 
-	@go test -count 1 -p 1 `go list github.com/cosmos/cosmos-sdk/cmd/gaia/cli_test`
-
 test_unit:
-	@go test $(PACKAGES_NOCLITEST)
+	@GOCACHE=off go test -p 1 $(PACKAGES)
+
+test100:
+	@for i in {1..100}; do make test; done
 
 test_cover:
 	@bash tests/test_cover.sh
@@ -99,7 +98,7 @@ test_lint:
 	gometalinter --disable-all --enable='golint' --vendor ./...
 
 benchmark:
-	@go test -bench=. $(PACKAGES_NOCLITEST)
+	@go test -bench=. $(PACKAGES)
 
 
 ########################################