diff --git a/Makefile b/Makefile
index fbebac11d..2f6f1cdd1 100644
--- a/Makefile
+++ b/Makefile
@@ -61,14 +61,8 @@ test-integration: .gopath
 			-test.integration \
 			-test.datafile=$(PWD)/testsuite/fake-data.tar.gz
 
-all.cov: .gopath $(SOURCE) test-integration
-	cd $(BASEPATH) && \
-		go list ./... | while read pkg; do \
-			go test -covermode=count -coverprofile=$$(echo $$pkg | base64).cov $$pkg; \
-		done
-
-	echo "mode: count" > all.cov
-	tail -q -n +2 *.cov >> all.cov
+all.cov: .gopath $(SOURCE)
+	cd $(BASEPATH) && go run run_tests.go all.cov
 
 env:
 	@echo export GOPATH=\"$(GOPATH)\"
diff --git a/coverage_all.sh b/coverage_all.sh
deleted file mode 100755
index ae448b743..000000000
--- a/coverage_all.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-TARGETFILE="$1"
-
-go list ./... | while read pkg; do
-    go test -covermode=count -coverprofile=$(base64 <<< $pkg).cov $pkg
-done
-
-echo "mode: count" > $TARGETFILE
-tail -q -n +2 *.cov */*.cov */*/*.cov >> $TARGETFILE