diff --git a/test/unit/lib/vhost/vhost.c/Makefile b/test/unit/lib/vhost/vhost.c/Makefile
index bb62741b9a..3c30f5a816 100644
--- a/test/unit/lib/vhost/vhost.c/Makefile
+++ b/test/unit/lib/vhost/vhost.c/Makefile
@@ -35,24 +35,8 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
 
-SPDK_LIB_LIST = log util
-
-CFLAGS += -I$(SPDK_ROOT_DIR)/test
-CFLAGS += -I$(SPDK_ROOT_DIR)/lib/vhost
 CFLAGS += -I$(SPDK_ROOT_DIR)/lib/vhost/rte_vhost
 CFLAGS += $(ENV_CFLAGS)
-LIBS += $(SPDK_LIB_LINKER_ARGS)
-LIBS += -lcunit
+TEST_FILE = vhost_ut.c
 
-APP = vhost_ut
-C_SRCS = vhost_ut.c
-
-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/vhost/vhost.c/vhost_ut.c b/test/unit/lib/vhost/vhost.c/vhost_ut.c
index 3957f94088..cc805a78e4 100644
--- a/test/unit/lib/vhost/vhost.c/vhost_ut.c
+++ b/test/unit/lib/vhost/vhost.c/vhost_ut.c
@@ -39,7 +39,7 @@
 #include "spdk_internal/mock.h"
 #include "lib/test_env.c"
 
-#include "vhost.c"
+#include "vhost/vhost.c"
 
 DEFINE_STUB(rte_vhost_driver_unregister, int, (const char *path), 0);
 DEFINE_STUB(spdk_event_allocate, struct spdk_event *,
diff --git a/test/unit/lib/vhost/vhost_blk.c/Makefile b/test/unit/lib/vhost/vhost_blk.c/Makefile
index 6b8249bf6c..359e71975d 100644
--- a/test/unit/lib/vhost/vhost_blk.c/Makefile
+++ b/test/unit/lib/vhost/vhost_blk.c/Makefile
@@ -35,24 +35,8 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
 
-SPDK_LIB_LIST = log util
-
-CFLAGS += -I$(SPDK_ROOT_DIR)/test
-CFLAGS += -I$(SPDK_ROOT_DIR)/lib/vhost
 CFLAGS += -I$(SPDK_ROOT_DIR)/lib/vhost/rte_vhost
 CFLAGS += $(ENV_CFLAGS)
-LIBS += $(SPDK_LIB_LINKER_ARGS)
-LIBS += -lcunit
+TEST_FILE = vhost_blk_ut.c
 
-APP = vhost_blk_ut
-C_SRCS = vhost_blk_ut.c
-
-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/vhost/vhost_blk.c/vhost_blk_ut.c b/test/unit/lib/vhost/vhost_blk.c/vhost_blk_ut.c
index c4a59bf6ae..1ea6354414 100644
--- a/test/unit/lib/vhost/vhost_blk.c/vhost_blk_ut.c
+++ b/test/unit/lib/vhost/vhost_blk.c/vhost_blk_ut.c
@@ -38,7 +38,7 @@
 #include "spdk_internal/mock.h"
 #include "lib/test_env.c"
 
-#include "vhost_blk.c"
+#include "vhost/vhost_blk.c"
 #include "unit/lib/vhost/test_vhost.c"
 
 #include "spdk_internal/bdev.h"
diff --git a/test/unit/lib/vhost/vhost_scsi.c/Makefile b/test/unit/lib/vhost/vhost_scsi.c/Makefile
index ec07e22ac3..3b8a59b083 100644
--- a/test/unit/lib/vhost/vhost_scsi.c/Makefile
+++ b/test/unit/lib/vhost/vhost_scsi.c/Makefile
@@ -35,24 +35,8 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
 
-SPDK_LIB_LIST = log util
-
-CFLAGS += -I$(SPDK_ROOT_DIR)/test
-CFLAGS += -I$(SPDK_ROOT_DIR)/lib/vhost
 CFLAGS += -I$(SPDK_ROOT_DIR)/lib/vhost/rte_vhost
 CFLAGS += $(ENV_CFLAGS)
-LIBS += $(SPDK_LIB_LINKER_ARGS)
-LIBS += -lcunit
+TEST_FILE = vhost_scsi_ut.c
 
-APP = vhost_scsi_ut
-C_SRCS = vhost_scsi_ut.c
-
-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/vhost/vhost_scsi.c/vhost_scsi_ut.c b/test/unit/lib/vhost/vhost_scsi.c/vhost_scsi_ut.c
index 1205100db2..f25b9ac987 100644
--- a/test/unit/lib/vhost/vhost_scsi.c/vhost_scsi_ut.c
+++ b/test/unit/lib/vhost/vhost_scsi.c/vhost_scsi_ut.c
@@ -39,8 +39,8 @@
 #include "lib/test_env.c"
 
 #include "spdk/scsi.h"
-#include "vhost_scsi.c"
-#include "../scsi/scsi_internal.h"
+#include "vhost/vhost_scsi.c"
+#include "scsi/scsi_internal.h"
 #include "unit/lib/vhost/test_vhost.c"
 
 #include "spdk/env.h"