diff --git a/mk/nvmf.unittest.mk b/mk/nvmf.unittest.mk
deleted file mode 100644
index 235f71187a..0000000000
--- a/mk/nvmf.unittest.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-#  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
-include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
-
-C_SRCS = $(TEST_FILE)
-
-CFLAGS += -I$(SPDK_ROOT_DIR)/lib/nvmf
-CFLAGS += -I$(SPDK_ROOT_DIR)/test
-
-SPDK_LIB_LIST = util log
-
-LIBS += -lcunit $(SPDK_LIB_LINKER_ARGS)
-
-APP = $(TEST_FILE:.c=)
-
-all: $(APP)
-
-$(APP) : $(OBJS) $(SPDK_LIB_FILES)
-	$(LINK_C)
-
-clean:
-	$(CLEAN_C) $(APP)
-
-include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk
diff --git a/test/unit/lib/nvmf/ctrlr.c/Makefile b/test/unit/lib/nvmf/ctrlr.c/Makefile
index 7f4342deb6..c68c589abf 100644
--- a/test/unit/lib/nvmf/ctrlr.c/Makefile
+++ b/test/unit/lib/nvmf/ctrlr.c/Makefile
@@ -35,4 +35,4 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..)
 
 TEST_FILE = ctrlr_ut.c
 
-include $(SPDK_ROOT_DIR)/mk/nvmf.unittest.mk
+include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk
diff --git a/test/unit/lib/nvmf/ctrlr.c/ctrlr_ut.c b/test/unit/lib/nvmf/ctrlr.c/ctrlr_ut.c
index dcaab233c2..c5043f70e0 100644
--- a/test/unit/lib/nvmf/ctrlr.c/ctrlr_ut.c
+++ b/test/unit/lib/nvmf/ctrlr.c/ctrlr_ut.c
@@ -36,7 +36,7 @@
 #include "spdk_cunit.h"
 #include "spdk_internal/mock.h"
 
-#include "ctrlr.c"
+#include "nvmf/ctrlr.c"
 
 SPDK_LOG_REGISTER_COMPONENT("nvmf", SPDK_LOG_NVMF)
 
diff --git a/test/unit/lib/nvmf/ctrlr_bdev.c/Makefile b/test/unit/lib/nvmf/ctrlr_bdev.c/Makefile
index 366fa10e0c..1d22f14be8 100644
--- a/test/unit/lib/nvmf/ctrlr_bdev.c/Makefile
+++ b/test/unit/lib/nvmf/ctrlr_bdev.c/Makefile
@@ -35,4 +35,4 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..)
 
 TEST_FILE = ctrlr_bdev_ut.c
 
-include $(SPDK_ROOT_DIR)/mk/nvmf.unittest.mk
+include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk
diff --git a/test/unit/lib/nvmf/ctrlr_bdev.c/ctrlr_bdev_ut.c b/test/unit/lib/nvmf/ctrlr_bdev.c/ctrlr_bdev_ut.c
index 538dd4621c..b2dd759a9b 100644
--- a/test/unit/lib/nvmf/ctrlr_bdev.c/ctrlr_bdev_ut.c
+++ b/test/unit/lib/nvmf/ctrlr_bdev.c/ctrlr_bdev_ut.c
@@ -35,7 +35,7 @@
 
 #include "spdk_cunit.h"
 
-#include "ctrlr_bdev.c"
+#include "nvmf/ctrlr_bdev.c"
 
 
 SPDK_LOG_REGISTER_COMPONENT("nvmf", SPDK_LOG_NVMF)
diff --git a/test/unit/lib/nvmf/ctrlr_discovery.c/Makefile b/test/unit/lib/nvmf/ctrlr_discovery.c/Makefile
index 6578cbec79..e56238d2f7 100644
--- a/test/unit/lib/nvmf/ctrlr_discovery.c/Makefile
+++ b/test/unit/lib/nvmf/ctrlr_discovery.c/Makefile
@@ -35,4 +35,4 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..)
 
 TEST_FILE = ctrlr_discovery_ut.c
 
-include $(SPDK_ROOT_DIR)/mk/nvmf.unittest.mk
+include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk
diff --git a/test/unit/lib/nvmf/ctrlr_discovery.c/ctrlr_discovery_ut.c b/test/unit/lib/nvmf/ctrlr_discovery.c/ctrlr_discovery_ut.c
index 259a4c58e2..372fe1040e 100644
--- a/test/unit/lib/nvmf/ctrlr_discovery.c/ctrlr_discovery_ut.c
+++ b/test/unit/lib/nvmf/ctrlr_discovery.c/ctrlr_discovery_ut.c
@@ -35,8 +35,8 @@
 
 #include "spdk_cunit.h"
 
-#include "ctrlr_discovery.c"
-#include "subsystem.c"
+#include "nvmf/ctrlr_discovery.c"
+#include "nvmf/subsystem.c"
 
 SPDK_LOG_REGISTER_COMPONENT("nvmf", SPDK_LOG_NVMF)
 
diff --git a/test/unit/lib/nvmf/request.c/Makefile b/test/unit/lib/nvmf/request.c/Makefile
index 4c0f50b0e3..0c683cff07 100644
--- a/test/unit/lib/nvmf/request.c/Makefile
+++ b/test/unit/lib/nvmf/request.c/Makefile
@@ -35,4 +35,4 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..)
 
 TEST_FILE = request_ut.c
 
-include $(SPDK_ROOT_DIR)/mk/nvmf.unittest.mk
+include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk
diff --git a/test/unit/lib/nvmf/request.c/request_ut.c b/test/unit/lib/nvmf/request.c/request_ut.c
index 1432212a2d..c958cd4112 100644
--- a/test/unit/lib/nvmf/request.c/request_ut.c
+++ b/test/unit/lib/nvmf/request.c/request_ut.c
@@ -35,7 +35,7 @@
 
 #include "spdk_cunit.h"
 
-#include "request.c"
+#include "nvmf/request.c"
 
 SPDK_LOG_REGISTER_COMPONENT("nvmf", SPDK_LOG_NVMF)
 
diff --git a/test/unit/lib/nvmf/subsystem.c/Makefile b/test/unit/lib/nvmf/subsystem.c/Makefile
index 362156af14..b62f1ee1a8 100644
--- a/test/unit/lib/nvmf/subsystem.c/Makefile
+++ b/test/unit/lib/nvmf/subsystem.c/Makefile
@@ -35,4 +35,4 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..)
 
 TEST_FILE = subsystem_ut.c
 
-include $(SPDK_ROOT_DIR)/mk/nvmf.unittest.mk
+include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk
diff --git a/test/unit/lib/nvmf/subsystem.c/subsystem_ut.c b/test/unit/lib/nvmf/subsystem.c/subsystem_ut.c
index a44195758b..5eaf61c564 100644
--- a/test/unit/lib/nvmf/subsystem.c/subsystem_ut.c
+++ b/test/unit/lib/nvmf/subsystem.c/subsystem_ut.c
@@ -35,7 +35,7 @@
 
 #include "spdk_cunit.h"
 
-#include "subsystem.c"
+#include "nvmf/subsystem.c"
 
 SPDK_LOG_REGISTER_COMPONENT("nvmf", SPDK_LOG_NVMF)