diff --git a/test/lib/Makefile b/test/lib/Makefile
index fa76b2aec..067a87d90 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 blobfs env event iscsi json log nvme
+DIRS-y = bdev blobfs env event iscsi json nvme
 
 .PHONY: all clean $(DIRS-y)
 
diff --git a/test/unit/lib/Makefile b/test/unit/lib/Makefile
index 61a799460..78c4143a7 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 blob ioat json jsonrpc nvme nvmf scsi util
+DIRS-y = bdev blob ioat json jsonrpc log nvme nvmf scsi util
 
 .PHONY: all clean $(DIRS-y)
 
diff --git a/test/unit/lib/log/Makefile b/test/unit/lib/log/Makefile
new file mode 100644
index 000000000..79411a459
--- /dev/null
+++ b/test/unit/lib/log/Makefile
@@ -0,0 +1,44 @@
+#
+#  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.
+#
+
+SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
+include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
+
+DIRS-y = log.c
+
+.PHONY: all clean $(DIRS-y)
+
+all: $(DIRS-y)
+clean: $(DIRS-y)
+
+include $(SPDK_ROOT_DIR)/mk/spdk.subdirs.mk
diff --git a/test/lib/log/.gitignore b/test/unit/lib/log/log.c/.gitignore
similarity index 100%
rename from test/lib/log/.gitignore
rename to test/unit/lib/log/log.c/.gitignore
diff --git a/test/lib/log/Makefile b/test/unit/lib/log/log.c/Makefile
similarity index 97%
rename from test/lib/log/Makefile
rename to test/unit/lib/log/log.c/Makefile
index bf131246c..9b365bf9b 100644
--- a/test/lib/log/Makefile
+++ b/test/unit/lib/log/log.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)/../../../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
 APP = log_ut
diff --git a/test/lib/log/log_ut.c b/test/unit/lib/log/log.c/log_ut.c
similarity index 100%
rename from test/lib/log/log_ut.c
rename to test/unit/lib/log/log.c/log_ut.c
diff --git a/unittest.sh b/unittest.sh
index 1c58750a1..ed13554de 100755
--- a/unittest.sh
+++ b/unittest.sh
@@ -55,7 +55,7 @@ $valgrind test/unit/lib/json/json_write.c/json_write_ut
 
 $valgrind test/unit/lib/jsonrpc/jsonrpc_server.c/jsonrpc_server_ut
 
-$valgrind test/lib/log/log_ut
+$valgrind test/unit/lib/log/log.c/log_ut
 
 $valgrind test/unit/lib/nvmf/discovery.c/discovery_ut
 $valgrind test/unit/lib/nvmf/request.c/request_ut