diff --git a/mk/json.unittest.mk b/mk/json.unittest.mk
deleted file mode 100644
index b08655bc8..000000000
--- a/mk/json.unittest.mk
+++ /dev/null
@@ -1,64 +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
-
-JSON_DIR := $(SPDK_ROOT_DIR)/lib/json
-JSONRPC_DIR := $(SPDK_ROOT_DIR)/lib/jsonrpc
-
-SPDK_LIB_LIST = json util log
-
-C_SRCS = $(TEST_FILE) $(OTHER_FILES)
-
-CFLAGS += -I$(JSON_DIR)
-CFLAGS += -I$(JSONRPC_DIR)
-CFLAGS += -I$(SPDK_ROOT_DIR)/lib
-CFLAGS += -I$(SPDK_ROOT_DIR)/test
-
-LIBS += $(SPDK_LIB_LINKER_ARGS) -lcunit
-
-APP = $(TEST_FILE:.c=)
-
-all: $(APP)
-
-$(APP) : $(OBJS) $(SPDK_LIB_FILES)
-	$(LINK_C)
-
-clean:
-	$(CLEAN_C) $(APP)
-
-%.o: $(JSON_DIR)/%.c %.d $(MAKEFILE_LIST)
-	$(COMPILE_C)
-
-include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk
diff --git a/mk/spdk.unittest.mk b/mk/spdk.unittest.mk
index f3ac5551b..2e6cd164d 100644
--- a/mk/spdk.unittest.mk
+++ b/mk/spdk.unittest.mk
@@ -40,7 +40,7 @@ C_SRCS = $(TEST_FILE)
 CFLAGS += -I$(SPDK_ROOT_DIR)/lib
 CFLAGS += -I$(SPDK_ROOT_DIR)/test
 
-SPDK_LIB_LIST = util log spdk_mock
+SPDK_LIB_LIST += util log spdk_mock
 
 LIBS += -lcunit $(SPDK_LIB_LINKER_ARGS)
 
diff --git a/test/unit/lib/json/json_parse.c/Makefile b/test/unit/lib/json/json_parse.c/Makefile
index d54d56df8..3d4100240 100644
--- a/test/unit/lib/json/json_parse.c/Makefile
+++ b/test/unit/lib/json/json_parse.c/Makefile
@@ -35,4 +35,4 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..)
 
 TEST_FILE = json_parse_ut.c
 
-include $(SPDK_ROOT_DIR)/mk/json.unittest.mk
+include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk
diff --git a/test/unit/lib/json/json_parse.c/json_parse_ut.c b/test/unit/lib/json/json_parse.c/json_parse_ut.c
index a50db1664..874403973 100644
--- a/test/unit/lib/json/json_parse.c/json_parse_ut.c
+++ b/test/unit/lib/json/json_parse.c/json_parse_ut.c
@@ -35,7 +35,7 @@
 
 #include "spdk_cunit.h"
 
-#include "json_parse.c"
+#include "json/json_parse.c"
 
 static uint8_t g_buf[1000];
 static void *g_end;
diff --git a/test/unit/lib/json/json_util.c/Makefile b/test/unit/lib/json/json_util.c/Makefile
index 527732682..c9a282083 100644
--- a/test/unit/lib/json/json_util.c/Makefile
+++ b/test/unit/lib/json/json_util.c/Makefile
@@ -35,4 +35,4 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..)
 
 TEST_FILE = json_util_ut.c
 
-include $(SPDK_ROOT_DIR)/mk/json.unittest.mk
+include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk
diff --git a/test/unit/lib/json/json_util.c/json_util_ut.c b/test/unit/lib/json/json_util.c/json_util_ut.c
index 8c99c870c..e1996a18f 100644
--- a/test/unit/lib/json/json_util.c/json_util_ut.c
+++ b/test/unit/lib/json/json_util.c/json_util_ut.c
@@ -35,7 +35,7 @@
 
 #include "spdk_cunit.h"
 
-#include "json_util.c"
+#include "json/json_util.c"
 
 #define NUM_SETUP(x) \
 	snprintf(buf, sizeof(buf), "%s", x); \
diff --git a/test/unit/lib/json/json_write.c/Makefile b/test/unit/lib/json/json_write.c/Makefile
index 9d105d06b..9fe1fa916 100644
--- a/test/unit/lib/json/json_write.c/Makefile
+++ b/test/unit/lib/json/json_write.c/Makefile
@@ -34,6 +34,5 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..)
 
 TEST_FILE = json_write_ut.c
-OTHER_FILES = json_parse.c
 
-include $(SPDK_ROOT_DIR)/mk/json.unittest.mk
+include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk
diff --git a/test/unit/lib/json/json_write.c/json_write_ut.c b/test/unit/lib/json/json_write.c/json_write_ut.c
index 2bb2a7104..a54ef1b01 100644
--- a/test/unit/lib/json/json_write.c/json_write_ut.c
+++ b/test/unit/lib/json/json_write.c/json_write_ut.c
@@ -35,7 +35,8 @@
 
 #include "spdk_cunit.h"
 
-#include "json_write.c"
+#include "json/json_write.c"
+#include "json/json_parse.c"
 
 #include "spdk/util.h"
 
diff --git a/test/unit/lib/jsonrpc/jsonrpc_server.c/Makefile b/test/unit/lib/jsonrpc/jsonrpc_server.c/Makefile
index 66dc98156..6c02115f7 100644
--- a/test/unit/lib/jsonrpc/jsonrpc_server.c/Makefile
+++ b/test/unit/lib/jsonrpc/jsonrpc_server.c/Makefile
@@ -34,5 +34,6 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..)
 
 TEST_FILE = jsonrpc_server_ut.c
+SPDK_LIB_LIST = json
 
-include $(SPDK_ROOT_DIR)/mk/json.unittest.mk
+include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk
diff --git a/test/unit/lib/jsonrpc/jsonrpc_server.c/jsonrpc_server_ut.c b/test/unit/lib/jsonrpc/jsonrpc_server.c/jsonrpc_server_ut.c
index 7661e2bd5..768b881a5 100644
--- a/test/unit/lib/jsonrpc/jsonrpc_server.c/jsonrpc_server_ut.c
+++ b/test/unit/lib/jsonrpc/jsonrpc_server.c/jsonrpc_server_ut.c
@@ -35,7 +35,7 @@
 
 #include "spdk_cunit.h"
 
-#include "jsonrpc_server.c"
+#include "jsonrpc/jsonrpc_server.c"
 
 #define MAX_PARAMS	100
 #define MAX_REQS	100