diff --git a/test/unit/lib/blob/blob.c/Makefile b/test/unit/lib/blob/blob.c/Makefile
index 6ba7573a6..6e279ff0e 100644
--- a/test/unit/lib/blob/blob.c/Makefile
+++ b/test/unit/lib/blob/blob.c/Makefile
@@ -36,21 +36,6 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
 include $(SPDK_ROOT_DIR)/mk/spdk.mock.unittest.mk
 
-APP = blob_ut
+TEST_FILE = blob_ut.c
 
-C_SRCS := blob_ut.c
-CFLAGS += -I$(SPDK_ROOT_DIR)/lib/blob -I$(SPDK_ROOT_DIR)/test
-
-SPDK_LIB_LIST = util log spdk_mock
-
-LIBS += $(SPDK_LIB_LINKER_ARGS) -lcunit
-
-all : $(APP)
-
-$(APP) : $(OBJS) $(SPDK_LIB_FILES)
-	$(LINK_C)
-
-clean :
-	$(CLEAN_C) $(APP)
-
-include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk
+include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk
diff --git a/test/unit/lib/blob/blob.c/blob_ut.c b/test/unit/lib/blob/blob.c/blob_ut.c
index 5fb6334a7..3604f840f 100644
--- a/test/unit/lib/blob/blob.c/blob_ut.c
+++ b/test/unit/lib/blob/blob.c/blob_ut.c
@@ -38,9 +38,9 @@
 
 #include "lib/test_env.c"
 #include "../bs_dev_common.c"
-#include "blobstore.c"
-#include "request.c"
-#include "zeroes.c"
+#include "blob/blobstore.c"
+#include "blob/request.c"
+#include "blob/zeroes.c"
 
 struct spdk_blob_store *g_bs;
 spdk_blob_id g_blobid;
diff --git a/test/unit/lib/blobfs/tree.c/Makefile b/test/unit/lib/blobfs/tree.c/Makefile
index 251f6e804..64bc202a7 100644
--- a/test/unit/lib/blobfs/tree.c/Makefile
+++ b/test/unit/lib/blobfs/tree.c/Makefile
@@ -35,19 +35,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
 
-APP = tree_ut
+TEST_FILE = tree_ut.c
 
-C_SRCS := tree_ut.c
-CFLAGS += -I$(SPDK_ROOT_DIR)/lib/blobfs -I$(SPDK_ROOT_DIR)/test
-
-LIBS += $(SPDK_LIB_LINKER_ARGS) -lcunit
-
-all : $(APP)
-
-$(APP) : $(OBJS) $(SPDK_LIB_FILES)
-	$(LINK_C)
-
-clean :
-	$(CLEAN_C) $(APP)
-
-include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk
+include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk
diff --git a/test/unit/lib/blobfs/tree.c/tree_ut.c b/test/unit/lib/blobfs/tree.c/tree_ut.c
index cf5795968..c24aaa786 100644
--- a/test/unit/lib/blobfs/tree.c/tree_ut.c
+++ b/test/unit/lib/blobfs/tree.c/tree_ut.c
@@ -32,9 +32,8 @@
  */
 
 #include "spdk_cunit.h"
-#include "tree.h"
 
-#include "tree.c"
+#include "blobfs/tree.c"
 
 void
 spdk_cache_buffer_free(struct cache_buffer *cache_buffer)