diff --git a/Makefile b/Makefile
index 6f472f2..1216dad 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@
 
 IS_TOP_LEVEL := 1
 CLANG_LEVEL := .
-DIRS := include lib tools runtime docs
+DIRS := include lib tools runtime docs unittests
 
 PARALLEL_DIRS :=
 
@@ -64,10 +64,12 @@
 
 ifneq ($(PROJ_SRC_ROOT),$(PROJ_OBJ_ROOT))
 $(RecursiveTargets)::
-	$(Verb) if [ ! -f test/Makefile ]; then \
-	  $(MKDIR) test; \
-	  $(CP) $(PROJ_SRC_DIR)/test/Makefile test/Makefile; \
-	fi
+	$(Verb) for dir in test unittests; do \
+	  if [ ! -f $${dir}/Makefile ]; then \
+	    $(MKDIR) $${dir}; \
+	    $(CP) $(PROJ_SRC_DIR)/$${dir}/Makefile $${dir}/Makefile; \
+	  fi \
+	done
 endif
 
 test::