diff --git a/Makefile b/Makefile
index b6e2835..a42d5b4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,10 @@
-test:
-	docker build .
+TEST = "go test ./... -v -coverpkg=./... -coverprofile cp.out; go tool cover -func cp.out; rm cp.out"
+
+build:
+	docker build . -t underscore:latest
+
+test: build
+	docker run --name underscore --rm -i -t underscore bash -c $(TEST)
 
 doc:
 	cd docs && hugo server -D
\ No newline at end of file