diff --git a/test/unit/lib/scsi/dev.c/Makefile b/test/unit/lib/scsi/dev.c/Makefile
index b530adf14..4e7a5fa93 100644
--- a/test/unit/lib/scsi/dev.c/Makefile
+++ b/test/unit/lib/scsi/dev.c/Makefile
@@ -35,22 +35,6 @@ 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
+TEST_FILE = dev_ut.c
 
-CFLAGS += -I$(SPDK_ROOT_DIR)/test
-CFLAGS += -I$(SPDK_ROOT_DIR)/lib/scsi
-LIBS += $(SPDK_LIB_LINKER_ARGS)
-LIBS += -lcunit
-
-APP = dev_ut
-C_SRCS = dev_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/scsi/dev.c/dev_ut.c b/test/unit/lib/scsi/dev.c/dev_ut.c
index f957a5264..5f83000e3 100644
--- a/test/unit/lib/scsi/dev.c/dev_ut.c
+++ b/test/unit/lib/scsi/dev.c/dev_ut.c
@@ -38,8 +38,8 @@
 
 #include "spdk/util.h"
 
-#include "dev.c"
-#include "port.c"
+#include "scsi/dev.c"
+#include "scsi/port.c"
 
 /* Unit test bdev mockup */
 struct spdk_bdev {
diff --git a/test/unit/lib/scsi/lun.c/Makefile b/test/unit/lib/scsi/lun.c/Makefile
index 321b758a1..350ae78f9 100644
--- a/test/unit/lib/scsi/lun.c/Makefile
+++ b/test/unit/lib/scsi/lun.c/Makefile
@@ -35,22 +35,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
 
-SPDK_LIB_LIST = cunit log
+SPDK_LIB_LIST = cunit
+TEST_FILE = lun_ut.c
 
-CFLAGS += -I$(SPDK_ROOT_DIR)/test
-CFLAGS += -I$(SPDK_ROOT_DIR)/lib/scsi
-LIBS += $(SPDK_LIB_LINKER_ARGS)
-LIBS += -lcunit
-
-APP = lun_ut
-C_SRCS = lun_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/scsi/lun.c/lun_ut.c b/test/unit/lib/scsi/lun.c/lun_ut.c
index 37ec333c4..d2b03718a 100644
--- a/test/unit/lib/scsi/lun.c/lun_ut.c
+++ b/test/unit/lib/scsi/lun.c/lun_ut.c
@@ -35,8 +35,8 @@
 
 #include "spdk_cunit.h"
 
-#include "task.c"
-#include "lun.c"
+#include "scsi/task.c"
+#include "scsi/lun.c"
 
 #include "spdk_internal/mock.h"
 
diff --git a/test/unit/lib/scsi/scsi.c/Makefile b/test/unit/lib/scsi/scsi.c/Makefile
index b62a36940..868936534 100644
--- a/test/unit/lib/scsi/scsi.c/Makefile
+++ b/test/unit/lib/scsi/scsi.c/Makefile
@@ -35,22 +35,7 @@ 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 conf trace util
+SPDK_LIB_LIST = trace
+TEST_FILE = scsi_ut.c
 
-CFLAGS += -I$(SPDK_ROOT_DIR)/lib/scsi
-CFLAGS += -I$(SPDK_ROOT_DIR)/test
-LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)
-LIBS += -lcunit
-
-APP = scsi_ut
-C_SRCS = scsi_ut.c
-
-all: $(APP)
-
-$(APP): $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS)
-	$(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/scsi/scsi.c/scsi_ut.c b/test/unit/lib/scsi/scsi.c/scsi_ut.c
index 8b0fd7765..afa606508 100644
--- a/test/unit/lib/scsi/scsi.c/scsi_ut.c
+++ b/test/unit/lib/scsi/scsi.c/scsi_ut.c
@@ -37,7 +37,7 @@
 
 #include "spdk_cunit.h"
 
-#include "scsi.c"
+#include "scsi/scsi.c"
 
 static void
 scsi_init(void)
diff --git a/test/unit/lib/scsi/scsi_bdev.c/Makefile b/test/unit/lib/scsi/scsi_bdev.c/Makefile
index b94585067..abb1de50d 100644
--- a/test/unit/lib/scsi/scsi_bdev.c/Makefile
+++ b/test/unit/lib/scsi/scsi_bdev.c/Makefile
@@ -35,22 +35,6 @@ 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 cunit
+TEST_FILE = scsi_bdev_ut.c
 
-CFLAGS += -I$(SPDK_ROOT_DIR)/test
-CFLAGS += -I$(SPDK_ROOT_DIR)/lib/scsi
-LIBS += $(SPDK_LIB_LINKER_ARGS)
-LIBS += -lcunit
-
-APP = scsi_bdev_ut
-C_SRCS = scsi_bdev_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/scsi/scsi_bdev.c/scsi_bdev_ut.c b/test/unit/lib/scsi/scsi_bdev.c/scsi_bdev_ut.c
index e7bf9e329..b2c6b1e98 100644
--- a/test/unit/lib/scsi/scsi_bdev.c/scsi_bdev_ut.c
+++ b/test/unit/lib/scsi/scsi_bdev.c/scsi_bdev_ut.c
@@ -33,8 +33,8 @@
 
 #include "spdk/stdinc.h"
 
-#include "task.c"
-#include "scsi_bdev.c"
+#include "scsi/task.c"
+#include "scsi/scsi_bdev.c"
 
 #include "spdk_cunit.h"