diff --git a/Makefile b/Makefile
index 148baa73..198ed266 100644
--- a/Makefile
+++ b/Makefile
@@ -249,6 +249,11 @@ else
 endif
 
 
+.PHONY: test
+test: all
+	$(MAKE) -C test/unit test
+
+
 install: all $(PKGCFGF)
 	mkdir -p $(LIBDIR)
 ifeq ($(UNICORN_SHARED),yes)
@@ -302,6 +307,7 @@ ifeq (,$(findstring yes,$(UNICORN_BUILD_CORE_ONLY)))
 	cd samples && $(MAKE) clean
 	rm -f $(BLDIR)/samples/lib$(LIBNAME).$(EXT)
 endif
+	$(MAKE) -C test/unit clean
 
 ifdef BUILDDIR
 	rm -rf $(BUILDDIR)