diff --git a/test/unit/lib/iscsi/conn.c/Makefile b/test/unit/lib/iscsi/conn.c/Makefile
index 12ab57643..96f2f5d79 100644
--- a/test/unit/lib/iscsi/conn.c/Makefile
+++ b/test/unit/lib/iscsi/conn.c/Makefile
@@ -35,22 +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 cunit trace conf util
+SPDK_LIB_LIST = trace
 
-CFLAGS += -I$(SPDK_ROOT_DIR)/test
-CFLAGS += -I$(SPDK_ROOT_DIR)/lib
-LIBS += $(SPDK_LIB_LINKER_ARGS)
-LIBS += -lcunit
+TEST_FILE = conn_ut.c
 
-APP = conn_ut
-C_SRCS = conn_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/iscsi/init_grp.c/Makefile b/test/unit/lib/iscsi/init_grp.c/Makefile
index aa59354a1..9c87ef55b 100644
--- a/test/unit/lib/iscsi/init_grp.c/Makefile
+++ b/test/unit/lib/iscsi/init_grp.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 util cunit
+SPDK_LIB_LIST = conf
+TEST_FILE = init_grp_ut.c
 
-CFLAGS += -I$(SPDK_ROOT_DIR)/test
-CFLAGS += -I$(SPDK_ROOT_DIR)/lib
-LIBS += $(SPDK_LIB_LINKER_ARGS)
-LIBS += -lcunit
-
-APP = init_grp_ut
-C_SRCS = init_grp_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/iscsi/iscsi.c/Makefile b/test/unit/lib/iscsi/iscsi.c/Makefile
index f0eaf19c6..2093a6eb3 100644
--- a/test/unit/lib/iscsi/iscsi.c/Makefile
+++ b/test/unit/lib/iscsi/iscsi.c/Makefile
@@ -35,26 +35,14 @@ 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 cunit trace conf util
+SPDK_LIB_LIST = trace conf util
 
-CFLAGS += -I$(SPDK_ROOT_DIR)/test
-CFLAGS += -I$(SPDK_ROOT_DIR)/lib
-LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)
-LIBS += -lcunit -lcrypto
 SCSI_OBJS = port
 ISCSI_OBJS = md5 param
-OBJS += $(SCSI_OBJS:%=$(SPDK_ROOT_DIR)/lib/scsi/%.o)
-OBJS += $(ISCSI_OBJS:%=$(SPDK_ROOT_DIR)/lib/iscsi/%.o)
+LIBS += $(SCSI_OBJS:%=$(SPDK_ROOT_DIR)/lib/scsi/%.o)
+LIBS += $(ISCSI_OBJS:%=$(SPDK_ROOT_DIR)/lib/iscsi/%.o)
+LIBS += -lcunit -lcrypto $(ENV_LINKER_ARGS)
 
-APP = iscsi_ut
-C_SRCS = iscsi_ut.c
+TEST_FILE = iscsi_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/iscsi/param.c/Makefile b/test/unit/lib/iscsi/param.c/Makefile
index 48a666cb7..bc944ae99 100644
--- a/test/unit/lib/iscsi/param.c/Makefile
+++ b/test/unit/lib/iscsi/param.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 = param_ut.c
 
-CFLAGS += -I$(SPDK_ROOT_DIR)/test
-CFLAGS += -I$(SPDK_ROOT_DIR)/lib
-LIBS += $(SPDK_LIB_LINKER_ARGS)
-LIBS += -lcunit
-
-APP = param_ut
-C_SRCS = param_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/iscsi/portal_grp.c/Makefile b/test/unit/lib/iscsi/portal_grp.c/Makefile
index 2e8088ded..ab28cabbe 100644
--- a/test/unit/lib/iscsi/portal_grp.c/Makefile
+++ b/test/unit/lib/iscsi/portal_grp.c/Makefile
@@ -35,23 +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 conf util cunit
+SPDK_LIB_LIST = conf
 
-CFLAGS += $(ENV_CFLAGS)
-CFLAGS += -I$(SPDK_ROOT_DIR)/test
-CFLAGS += -I$(SPDK_ROOT_DIR)/lib
-LIBS += $(SPDK_LIB_LINKER_ARGS)
-LIBS += -lcunit
+TEST_FILE = portal_grp_ut.c
 
-APP = portal_grp_ut
-C_SRCS = portal_grp_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/iscsi/tgt_node.c/Makefile b/test/unit/lib/iscsi/tgt_node.c/Makefile
index bf019aec7..8cdf3ef3d 100644
--- a/test/unit/lib/iscsi/tgt_node.c/Makefile
+++ b/test/unit/lib/iscsi/tgt_node.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 util cunit
+SPDK_LIB_LIST = conf
+TEST_FILE = tgt_node_ut.c
 
-CFLAGS += -I$(SPDK_ROOT_DIR)/test
-CFLAGS += -I$(SPDK_ROOT_DIR)/lib
-LIBS += $(SPDK_LIB_LINKER_ARGS)
-LIBS += -lcunit
-
-APP = tgt_node_ut
-C_SRCS = tgt_node_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