diff --git a/test/lib/Makefile b/test/lib/Makefile
index f23b4a165..13eea8a84 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 scsi
+DIRS-y = bdev blob blobfs env event ioat iscsi json jsonrpc log nvme nvmf
 
 .PHONY: all clean $(DIRS-y)
 
diff --git a/test/lib/scsi/init/.gitignore b/test/lib/scsi/init/.gitignore
deleted file mode 100644
index 7397e7fb8..000000000
--- a/test/lib/scsi/init/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-init_ut
diff --git a/test/unit/lib/Makefile b/test/unit/lib/Makefile
index 0dc04eaee..55ca4348b 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 util
+DIRS-y = bdev scsi util
 
 .PHONY: all clean $(DIRS-y)
 
diff --git a/test/lib/scsi/Makefile b/test/unit/lib/scsi/Makefile
similarity index 95%
rename from test/lib/scsi/Makefile
rename to test/unit/lib/scsi/Makefile
index 500783718..9e4138977 100644
--- a/test/lib/scsi/Makefile
+++ b/test/unit/lib/scsi/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 = dev init lun scsi_bdev
+DIRS-y = dev.c lun.c scsi.c scsi_bdev.c
 
 .PHONY: all clean $(DIRS-y)
 
diff --git a/test/lib/scsi/dev/.gitignore b/test/unit/lib/scsi/dev.c/.gitignore
similarity index 100%
rename from test/lib/scsi/dev/.gitignore
rename to test/unit/lib/scsi/dev.c/.gitignore
diff --git a/test/lib/scsi/dev/Makefile b/test/unit/lib/scsi/dev.c/Makefile
similarity index 97%
rename from test/lib/scsi/dev/Makefile
rename to test/unit/lib/scsi/dev.c/Makefile
index 6f57dd6fe..b530adf14 100644
--- a/test/lib/scsi/dev/Makefile
+++ b/test/unit/lib/scsi/dev.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
 include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
 
diff --git a/test/lib/scsi/dev/dev_ut.c b/test/unit/lib/scsi/dev.c/dev_ut.c
similarity index 100%
rename from test/lib/scsi/dev/dev_ut.c
rename to test/unit/lib/scsi/dev.c/dev_ut.c
diff --git a/test/lib/scsi/lun/.gitignore b/test/unit/lib/scsi/lun.c/.gitignore
similarity index 100%
rename from test/lib/scsi/lun/.gitignore
rename to test/unit/lib/scsi/lun.c/.gitignore
diff --git a/test/lib/scsi/lun/Makefile b/test/unit/lib/scsi/lun.c/Makefile
similarity index 97%
rename from test/lib/scsi/lun/Makefile
rename to test/unit/lib/scsi/lun.c/Makefile
index 9a0a37279..321b758a1 100644
--- a/test/lib/scsi/lun/Makefile
+++ b/test/unit/lib/scsi/lun.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
 include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
 
diff --git a/test/lib/scsi/lun/lun_ut.c b/test/unit/lib/scsi/lun.c/lun_ut.c
similarity index 100%
rename from test/lib/scsi/lun/lun_ut.c
rename to test/unit/lib/scsi/lun.c/lun_ut.c
diff --git a/test/unit/lib/scsi/scsi.c/.gitignore b/test/unit/lib/scsi/scsi.c/.gitignore
new file mode 100644
index 000000000..99a7db2b1
--- /dev/null
+++ b/test/unit/lib/scsi/scsi.c/.gitignore
@@ -0,0 +1 @@
+scsi_ut
diff --git a/test/lib/scsi/init/Makefile b/test/unit/lib/scsi/scsi.c/Makefile
similarity index 95%
rename from test/lib/scsi/init/Makefile
rename to test/unit/lib/scsi/scsi.c/Makefile
index bd0c35876..754c87a83 100644
--- a/test/lib/scsi/init/Makefile
+++ b/test/unit/lib/scsi/scsi.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
 include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
 
@@ -42,8 +42,8 @@ CFLAGS += -I$(SPDK_ROOT_DIR)/test
 LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)
 LIBS += -lcunit
 
-APP = init_ut
-C_SRCS = init_ut.c
+APP = scsi_ut
+C_SRCS = scsi_ut.c
 
 all: $(APP)
 
diff --git a/test/lib/scsi/init/init_ut.c b/test/unit/lib/scsi/scsi.c/scsi_ut.c
similarity index 100%
rename from test/lib/scsi/init/init_ut.c
rename to test/unit/lib/scsi/scsi.c/scsi_ut.c
diff --git a/test/lib/scsi/scsi_bdev/.gitignore b/test/unit/lib/scsi/scsi_bdev.c/.gitignore
similarity index 100%
rename from test/lib/scsi/scsi_bdev/.gitignore
rename to test/unit/lib/scsi/scsi_bdev.c/.gitignore
diff --git a/test/lib/scsi/scsi_bdev/Makefile b/test/unit/lib/scsi/scsi_bdev.c/Makefile
similarity index 97%
rename from test/lib/scsi/scsi_bdev/Makefile
rename to test/unit/lib/scsi/scsi_bdev.c/Makefile
index 51e8ec37b..b94585067 100644
--- a/test/lib/scsi/scsi_bdev/Makefile
+++ b/test/unit/lib/scsi/scsi_bdev.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
 include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
 
diff --git a/test/lib/scsi/scsi_bdev/scsi_bdev_ut.c b/test/unit/lib/scsi/scsi_bdev.c/scsi_bdev_ut.c
similarity index 100%
rename from test/lib/scsi/scsi_bdev/scsi_bdev_ut.c
rename to test/unit/lib/scsi/scsi_bdev.c/scsi_bdev_ut.c
diff --git a/unittest.sh b/unittest.sh
index 9918ffd0d..8f0cae409 100755
--- a/unittest.sh
+++ b/unittest.sh
@@ -64,10 +64,10 @@ $valgrind test/lib/nvmf/subsystem/subsystem_ut
 $valgrind test/lib/nvmf/direct/direct_ut
 $valgrind test/lib/nvmf/virtual/virtual_ut
 
-$valgrind test/lib/scsi/dev/dev_ut
-$valgrind test/lib/scsi/init/init_ut
-$valgrind test/lib/scsi/lun/lun_ut
-$valgrind test/lib/scsi/scsi_bdev/scsi_bdev_ut
+$valgrind test/unit/lib/scsi/dev.c/dev_ut
+$valgrind test/unit/lib/scsi/lun.c/lun_ut
+$valgrind test/unit/lib/scsi/scsi.c/scsi_ut
+$valgrind test/unit/lib/scsi/scsi_bdev.c/scsi_bdev_ut
 
 $valgrind test/lib/iscsi/param/param_ut
 $valgrind test/lib/iscsi/target_node/target_node_ut test/lib/iscsi/target_node/target_node.conf