diff --git a/Makefile b/Makefile
index e4c265e..4698fb9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,17 @@
 TEST_IMAGE?=vault-helm-test
 
-test-docker:
+test-image:
 	@docker build --rm -t '$(TEST_IMAGE)' -f $(CURDIR)/test/docker/Test.dockerfile $(CURDIR)
 
+test-unit:
+	@docker run -it -v ${PWD}:/helm-test vault-helm-test bats /helm-test/test/unit
+
+test-acceptance:
+	@docker run -it -v ${PWD}:/helm-test vault-helm-test bats /helm-test/test/acceptance
+
+test-bats: test-unit test-acceptance
+
+test: test-image test-bats
+
+
 .PHONY: test-docker