diff --git a/test/lib/Makefile b/test/lib/Makefile
index 13eea8a84..782f7a709 100644
--- a/test/lib/Makefile
+++ b/test/lib/Makefile
@@ -34,7 +34,7 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-DIRS-y = bdev blob blobfs env event ioat iscsi json jsonrpc log nvme nvmf
+DIRS-y = bdev blob blobfs env event ioat iscsi json log nvme nvmf
 
 .PHONY: all clean $(DIRS-y)
 
diff --git a/test/unit/lib/Makefile b/test/unit/lib/Makefile
index b6bd151a6..287de59f7 100644
--- a/test/unit/lib/Makefile
+++ b/test/unit/lib/Makefile
@@ -34,7 +34,7 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-DIRS-y = bdev json scsi util
+DIRS-y = bdev json jsonrpc scsi util
 
 .PHONY: all clean $(DIRS-y)
 
diff --git a/test/lib/jsonrpc/Makefile b/test/unit/lib/jsonrpc/Makefile
similarity index 95%
rename from test/lib/jsonrpc/Makefile
rename to test/unit/lib/jsonrpc/Makefile
index c1200ce63..0fc0a2e96 100644
--- a/test/lib/jsonrpc/Makefile
+++ b/test/unit/lib/jsonrpc/Makefile
@@ -31,10 +31,10 @@
 #  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
+SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-DIRS-y = server
+DIRS-y = jsonrpc_server.c
 
 .PHONY: all clean $(DIRS-y)
 
diff --git a/test/lib/jsonrpc/server/.gitignore b/test/unit/lib/jsonrpc/jsonrpc_server.c/.gitignore
similarity index 100%
rename from test/lib/jsonrpc/server/.gitignore
rename to test/unit/lib/jsonrpc/jsonrpc_server.c/.gitignore
diff --git a/test/lib/jsonrpc/server/Makefile b/test/unit/lib/jsonrpc/jsonrpc_server.c/Makefile
similarity index 96%
rename from test/lib/jsonrpc/server/Makefile
rename to test/unit/lib/jsonrpc/jsonrpc_server.c/Makefile
index 67821c5ae..66dc98156 100644
--- a/test/lib/jsonrpc/server/Makefile
+++ b/test/unit/lib/jsonrpc/jsonrpc_server.c/Makefile
@@ -31,7 +31,7 @@
 #  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
+SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..)
 
 TEST_FILE = jsonrpc_server_ut.c
 
diff --git a/test/lib/jsonrpc/server/jsonrpc_server_ut.c b/test/unit/lib/jsonrpc/jsonrpc_server.c/jsonrpc_server_ut.c
similarity index 100%
rename from test/lib/jsonrpc/server/jsonrpc_server_ut.c
rename to test/unit/lib/jsonrpc/jsonrpc_server.c/jsonrpc_server_ut.c
diff --git a/unittest.sh b/unittest.sh
index 74d391a72..ccfcbc6b3 100755
--- a/unittest.sh
+++ b/unittest.sh
@@ -53,7 +53,7 @@ $valgrind test/unit/lib/json/json_parse.c/json_parse_ut
 $valgrind test/unit/lib/json/json_util.c/json_util_ut
 $valgrind test/unit/lib/json/json_write.c/json_write_ut
 
-$valgrind test/lib/jsonrpc/server/jsonrpc_server_ut
+$valgrind test/unit/lib/jsonrpc/jsonrpc_server.c/jsonrpc_server_ut
 
 $valgrind test/lib/log/log_ut