diff --git a/.gitignore b/.gitignore
index d2d414be4..920af7622 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *.swp
 *.swo
 *.pyc
+vendor
diff --git a/Makefile b/Makefile
index d80410ff1..4db16ccdd 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,8 @@ install:
 	go install github.com/tendermint/abci/cmd/...
 
 test:
-	go test `${NOVENDOR}`
+	find . -name test.sock -exec rm {} \;
+	go test -p 1 `${NOVENDOR}`
 	bash tests/test.sh
 
 test_integrations: get_vendor_deps install test