diff --git a/mk/nvmf.unittest.mk b/mk/nvmf.unittest.mk
new file mode 100644
index 000000000..bb46d81c8
--- /dev/null
+++ b/mk/nvmf.unittest.mk
@@ -0,0 +1,55 @@
+#
+#  BSD LICENSE
+#
+#  Copyright (c) Intel Corporation.
+#  All rights reserved.
+#
+#  Redistribution and use in source and binary forms, with or without
+#  modification, are permitted provided that the following conditions
+#  are met:
+#
+#    * Redistributions of source code must retain the above copyright
+#      notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above copyright
+#      notice, this list of conditions and the following disclaimer in
+#      the documentation and/or other materials provided with the
+#      distribution.
+#    * Neither the name of Intel Corporation nor the names of its
+#      contributors may be used to endorse or promote products derived
+#      from this software without specific prior written permission.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+#  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+#  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+#  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+#  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+#  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+#  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+#  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+#  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+#  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
+
+C_SRCS = $(TEST_FILE)
+
+CFLAGS += -I$(SPDK_ROOT_DIR)/lib/nvmf
+CFLAGS += -I$(SPDK_ROOT_DIR)/test
+
+SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_log.a
+
+LIBS += -lcunit $(SPDK_LIBS)
+
+APP = $(TEST_FILE:.c=)
+
+all: $(APP)
+
+$(APP) : $(OBJS) $(SPDK_LIBS)
+	$(LINK_C)
+
+clean:
+	$(CLEAN_C) $(APP)
+
+include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk
diff --git a/test/lib/nvmf/request/Makefile b/test/lib/nvmf/request/Makefile
index 984f2bea8..2abb7cf37 100644
--- a/test/lib/nvmf/request/Makefile
+++ b/test/lib/nvmf/request/Makefile
@@ -32,25 +32,7 @@
 #
 
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
-include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-CFLAGS += -I$(SPDK_ROOT_DIR)/lib/nvmf
-CFLAGS += -I$(SPDK_ROOT_DIR)/test
+TEST_FILE = request_ut.c
 
-SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_log.a
-
-LIBS += $(SPDK_LIBS)
-LIBS += -lcunit
-
-APP = request_ut
-C_SRCS = request_ut.c
-
-all: $(APP)
-
-$(APP): $(OBJS) $(SPDK_LIBS)
-	$(LINK_C)
-
-clean:
-	$(CLEAN_C) $(APP)
-
-include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk
+include $(SPDK_ROOT_DIR)/mk/nvmf.unittest.mk
diff --git a/test/lib/nvmf/session/Makefile b/test/lib/nvmf/session/Makefile
index 2a5b8cba7..ba3f8edc0 100644
--- a/test/lib/nvmf/session/Makefile
+++ b/test/lib/nvmf/session/Makefile
@@ -32,25 +32,7 @@
 #
 
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
-include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-CFLAGS += -I$(SPDK_ROOT_DIR)/lib/nvmf
-CFLAGS += -I$(SPDK_ROOT_DIR)/test
+TEST_FILE = session_ut.c
 
-SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_log.a
-
-LIBS += $(SPDK_LIBS)
-LIBS += -lcunit
-
-APP = session_ut
-C_SRCS = session_ut.c
-
-all: $(APP)
-
-$(APP): $(OBJS) $(SPDK_LIBS)
-	$(LINK_C)
-
-clean:
-	$(CLEAN_C) $(APP)
-
-include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk
+include $(SPDK_ROOT_DIR)/mk/nvmf.unittest.mk
diff --git a/test/lib/nvmf/subsystem/Makefile b/test/lib/nvmf/subsystem/Makefile
index d477ceb0d..8095f76cd 100644
--- a/test/lib/nvmf/subsystem/Makefile
+++ b/test/lib/nvmf/subsystem/Makefile
@@ -32,25 +32,7 @@
 #
 
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
-include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-CFLAGS += -I$(SPDK_ROOT_DIR)/lib/nvmf
-CFLAGS += -I$(SPDK_ROOT_DIR)/test
+TEST_FILE = subsystem_ut.c
 
-SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_log.a
-
-LIBS += $(SPDK_LIBS)
-LIBS += -lcunit
-
-APP = subsystem_ut
-C_SRCS = subsystem_ut.c
-
-all: $(APP)
-
-$(APP): $(OBJS) $(SPDK_LIBS)
-	$(LINK_C)
-
-clean:
-	$(CLEAN_C) $(APP)
-
-include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk
+include $(SPDK_ROOT_DIR)/mk/nvmf.unittest.mk