diff --git a/autotest.sh b/autotest.sh
index 1042f2ed85..317f28f58d 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -86,14 +86,8 @@ if [ $RUN_NIGHTLY -eq 1 ]; then
 	run_test test/lib/nvme/hotplug.sh intel
 	run_test test/lib/nvme/nvmemp.sh
 fi
-run_test test/lib/nvmf/nvmf.sh
 run_test test/lib/env/env.sh
 run_test test/lib/ioat/ioat.sh
-run_test test/lib/json/json.sh
-run_test test/lib/jsonrpc/jsonrpc.sh
-run_test test/lib/log/log.sh
-run_test test/lib/scsi/scsi.sh
-run_test test/lib/util/util.sh
 
 timing_exit lib
 
diff --git a/test/lib/ioat/ioat.sh b/test/lib/ioat/ioat.sh
index 3813b00d65..2d65886cd7 100755
--- a/test/lib/ioat/ioat.sh
+++ b/test/lib/ioat/ioat.sh
@@ -8,10 +8,6 @@ source $rootdir/scripts/autotest_common.sh
 
 timing_enter ioat
 
-timing_enter unit
-$valgrind $testdir/unit/ioat_ut
-timing_exit unit
-
 timing_enter perf
 $rootdir/examples/ioat/perf/perf -t 1
 timing_exit perf
diff --git a/test/lib/json/json.sh b/test/lib/json/json.sh
deleted file mode 100755
index bab6871000..0000000000
--- a/test/lib/json/json.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-
-set -xe
-
-testdir=$(readlink -f $(dirname $0))
-rootdir=$testdir/../../..
-source $rootdir/scripts/autotest_common.sh
-
-timing_enter json
-
-$valgrind $testdir/parse/json_parse_ut
-$valgrind $testdir/util/json_util_ut
-$valgrind $testdir/write/json_write_ut
-
-timing_exit json
diff --git a/test/lib/jsonrpc/jsonrpc.sh b/test/lib/jsonrpc/jsonrpc.sh
deleted file mode 100755
index 8a279b37a3..0000000000
--- a/test/lib/jsonrpc/jsonrpc.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-
-set -xe
-
-testdir=$(readlink -f $(dirname $0))
-rootdir=$testdir/../../..
-source $rootdir/scripts/autotest_common.sh
-
-timing_enter jsonrpc
-
-$valgrind $testdir/server/jsonrpc_server_ut
-
-timing_exit jsonrpc
diff --git a/test/lib/log/log.sh b/test/lib/log/log.sh
deleted file mode 100755
index af9704cb42..0000000000
--- a/test/lib/log/log.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-
-set -xe
-
-testdir=$(readlink -f $(dirname $0))
-rootdir=$testdir/../../..
-source $rootdir/scripts/autotest_common.sh
-
-timing_enter log
-
-$valgrind $testdir/log_ut
-
-timing_exit log
diff --git a/test/lib/nvme/nvme.sh b/test/lib/nvme/nvme.sh
index 6d68ee0c1b..5566c47dab 100755
--- a/test/lib/nvme/nvme.sh
+++ b/test/lib/nvme/nvme.sh
@@ -12,16 +12,6 @@ function linux_iter_pci {
 
 timing_enter nvme
 
-timing_enter unit
-$valgrind $testdir/unit/nvme_ns_cmd_c/nvme_ns_cmd_ut
-$valgrind $testdir/unit/nvme_c/nvme_ut
-$valgrind $testdir/unit/nvme_qpair_c/nvme_qpair_ut
-$valgrind $testdir/unit/nvme_ctrlr_c/nvme_ctrlr_ut
-$valgrind $testdir/unit/nvme_ctrlr_cmd_c/nvme_ctrlr_cmd_ut
-$valgrind $testdir/unit/nvme_pcie_c/nvme_pcie_ut
-$valgrind $testdir/unit/nvme_quirks_c/nvme_quirks_ut
-timing_exit unit
-
 if [ $RUN_NIGHTLY -eq 1 ]; then
 	timing_enter aer
 	$testdir/aer/aer
diff --git a/test/lib/nvmf/nvmf.sh b/test/lib/nvmf/nvmf.sh
deleted file mode 100755
index 9125c5509a..0000000000
--- a/test/lib/nvmf/nvmf.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-
-set -xe
-
-testdir=$(readlink -f $(dirname $0))
-rootdir=$testdir/../../..
-source $rootdir/scripts/autotest_common.sh
-
-timing_enter nvmf
-
-timing_enter unit
-$valgrind $testdir/request/request_ut
-$valgrind $testdir/session/session_ut
-$valgrind $testdir/subsystem/subsystem_ut
-$valgrind $testdir/direct/direct_ut
-timing_exit unit
-
-timing_exit nvmf
diff --git a/test/lib/scsi/scsi.sh b/test/lib/scsi/scsi.sh
deleted file mode 100755
index 7233e5e9ce..0000000000
--- a/test/lib/scsi/scsi.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-
-set -xe
-
-testdir=$(readlink -f $(dirname $0))
-rootdir=$testdir/../../..
-source $rootdir/scripts/autotest_common.sh
-
-timing_enter scsi
-
-$valgrind $testdir/dev/dev_ut
-$testdir/init/init_ut
-$valgrind $testdir/lun/lun_ut
-$testdir/scsi_bdev/scsi_bdev_ut
-$valgrind $testdir/scsi_nvme/scsi_nvme_ut
-
-timing_exit scsi
diff --git a/test/lib/util/util.sh b/test/lib/util/util.sh
deleted file mode 100755
index 97eefff135..0000000000
--- a/test/lib/util/util.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-set -xe
-
-testdir=$(readlink -f $(dirname $0))
-rootdir=$testdir/../../..
-source $rootdir/scripts/autotest_common.sh
-
-timing_enter util
-
-$valgrind $testdir/bit_array/bit_array_ut
-$valgrind $testdir/io_channel/io_channel_ut
-
-timing_exit util
diff --git a/unittest.sh b/unittest.sh
index c5adb4e937..a3ada373b9 100755
--- a/unittest.sh
+++ b/unittest.sh
@@ -29,6 +29,7 @@ $valgrind test/lib/nvmf/subsystem/subsystem_ut
 $valgrind test/lib/nvmf/direct/direct_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/lib/scsi/scsi_nvme/scsi_nvme_ut