diff --git a/Makefile b/Makefile
index b8d3e27cd..ac1d83870 100644
--- a/Makefile
+++ b/Makefile
@@ -27,6 +27,7 @@ help:
 	@echo
 	@echo " * 'install'       - Install binaries to system locations"
 	@echo " * 'binaries'      - Build cri-containerd"
+	@echo " * 'test'          - Test cri-containerd" 
 	@echo " * 'clean'         - Clean artifacts"
 	@echo " * 'verify'        - Execute the source code verification tools"
 	@echo " * 'install.tools' - Installs tools used by verify"
@@ -57,6 +58,9 @@ cri-containerd: check-gopath
 	$(GO) build -o $(BUILD_DIR)/$@ \
 		$(PROJECT)/cmd/cri-containerd
 
+test: 
+	go test -timeout=1m -v -race ./pkg/... $(BUILD_TAGS)
+
 clean:
 	rm -f $(BUILD_DIR)/cri-containerd
 
@@ -91,6 +95,7 @@ install.tools: .install.gitvalidation .install.gometalinter
 .PHONY: \
 	binaries \
 	boiler \
+	test \
 	clean \
 	default \
 	gofmt \