diff --git a/autotest.sh b/autotest.sh
index acace47a3..2254d2f2c 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -97,7 +97,7 @@ fi
 timing_enter lib
 
 if [ $SPDK_TEST_BLOCKDEV -eq 1 ]; then
-	run_test test/lib/bdev/blockdev.sh
+	run_test test/bdev/blockdev.sh
 fi
 
 if [ $SPDK_TEST_EVENT -eq 1 ]; then
diff --git a/test/Makefile b/test/Makefile
index ab0623d3d..031ddf043 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -35,7 +35,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
 # These directories contain tests.
-TESTDIRS = app cpp_headers lib unit
+TESTDIRS = app bdev cpp_headers lib unit
 
 DIRS-y = $(TESTDIRS)
 
diff --git a/test/lib/bdev/Makefile b/test/bdev/Makefile
similarity index 97%
rename from test/lib/bdev/Makefile
rename to test/bdev/Makefile
index 4b872ec34..cb15bd49a 100644
--- a/test/lib/bdev/Makefile
+++ b/test/bdev/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
 
 DIRS-y = bdevio bdevperf
diff --git a/test/lib/bdev/bdev.conf.in b/test/bdev/bdev.conf.in
similarity index 100%
rename from test/lib/bdev/bdev.conf.in
rename to test/bdev/bdev.conf.in
diff --git a/test/lib/bdev/bdevio/.gitignore b/test/bdev/bdevio/.gitignore
similarity index 100%
rename from test/lib/bdev/bdevio/.gitignore
rename to test/bdev/bdevio/.gitignore
diff --git a/test/lib/bdev/bdevio/Makefile b/test/bdev/bdevio/Makefile
similarity index 97%
rename from test/lib/bdev/bdevio/Makefile
rename to test/bdev/bdevio/Makefile
index c96ebd430..7348b1698 100644
--- a/test/lib/bdev/bdevio/Makefile
+++ b/test/bdev/bdevio/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
 include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk
diff --git a/test/lib/bdev/bdevio/bdevio.c b/test/bdev/bdevio/bdevio.c
similarity index 100%
rename from test/lib/bdev/bdevio/bdevio.c
rename to test/bdev/bdevio/bdevio.c
diff --git a/test/lib/bdev/bdevperf/.gitignore b/test/bdev/bdevperf/.gitignore
similarity index 100%
rename from test/lib/bdev/bdevperf/.gitignore
rename to test/bdev/bdevperf/.gitignore
diff --git a/test/lib/bdev/bdevperf/Makefile b/test/bdev/bdevperf/Makefile
similarity index 97%
rename from test/lib/bdev/bdevperf/Makefile
rename to test/bdev/bdevperf/Makefile
index a1ec4923d..de59c62f2 100644
--- a/test/lib/bdev/bdevperf/Makefile
+++ b/test/bdev/bdevperf/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
 include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk
diff --git a/test/lib/bdev/bdevperf/bdevperf.c b/test/bdev/bdevperf/bdevperf.c
similarity index 100%
rename from test/lib/bdev/bdevperf/bdevperf.c
rename to test/bdev/bdevperf/bdevperf.c
diff --git a/test/lib/bdev/blockdev.sh b/test/bdev/blockdev.sh
similarity index 96%
rename from test/lib/bdev/blockdev.sh
rename to test/bdev/blockdev.sh
index 9bf8a968c..858f972a8 100755
--- a/test/lib/bdev/blockdev.sh
+++ b/test/bdev/blockdev.sh
@@ -3,7 +3,7 @@
 set -e
 
 testdir=$(readlink -f $(dirname $0))
-rootdir=$(readlink -f $testdir/../../..)
+rootdir=$(readlink -f $testdir/../..)
 plugindir=$rootdir/examples/bdev/fio_plugin
 
 function run_fio()
@@ -89,7 +89,7 @@ if [ -d /usr/src/fio ] && [ $SPDK_RUN_ASAN -eq 0 ]; then
 		fio_config_add_job $testdir/bdev.fio $b
 	done
 
-	run_fio --spdk_conf=./test/lib/bdev/bdev.conf
+	run_fio --spdk_conf=./test/bdev/bdev.conf
 
 	rm -f *.state
 	rm -f $testdir/bdev.fio
@@ -102,7 +102,7 @@ if [ -d /usr/src/fio ] && [ $SPDK_RUN_ASAN -eq 0 ]; then
 		fio_config_add_job $testdir/bdev.fio $b
 	done
 
-	run_fio --spdk_conf=./test/lib/bdev/bdev.conf
+	run_fio --spdk_conf=./test/bdev/bdev.conf
 
 	rm -f *.state
 	rm -f $testdir/bdev.fio
diff --git a/test/lib/bdev/common.c b/test/bdev/common.c
similarity index 100%
rename from test/lib/bdev/common.c
rename to test/bdev/common.c
diff --git a/test/lib/bdev/nbd_common.sh b/test/bdev/nbd_common.sh
similarity index 100%
rename from test/lib/bdev/nbd_common.sh
rename to test/bdev/nbd_common.sh
diff --git a/test/iscsi_tgt/initiator/initiator.sh b/test/iscsi_tgt/initiator/initiator.sh
index eedaddc60..04d1f892d 100755
--- a/test/iscsi_tgt/initiator/initiator.sh
+++ b/test/iscsi_tgt/initiator/initiator.sh
@@ -40,7 +40,7 @@ $rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE
 $rpc_py construct_target_node disk1 disk1_alias 'Malloc0:0' '1:2' 256 -d
 sleep 1
 trap "killprocess $pid; exit 1" SIGINT SIGTERM EXIT
-$rootdir/test/lib/bdev/bdevperf/bdevperf -c $testdir/bdev.conf -q 128 -s 4096 -w verify -t 5 -d 512
+$rootdir/test/bdev/bdevperf/bdevperf -c $testdir/bdev.conf -q 128 -s 4096 -w verify -t 5 -d 512
 
 trap - SIGINT SIGTERM EXIT
 
diff --git a/test/lib/Makefile b/test/lib/Makefile
index 0f03f0d9c..ad6fa4611 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 json nvme util
+DIRS-y = blobfs env event json nvme util
 
 .PHONY: all clean $(DIRS-y)
 
diff --git a/test/nvmf/host/bdevperf.sh b/test/nvmf/host/bdevperf.sh
index f000a3278..2124eb0ea 100755
--- a/test/nvmf/host/bdevperf.sh
+++ b/test/nvmf/host/bdevperf.sh
@@ -36,7 +36,7 @@ $rpc_py construct_nvmf_subsystem nqn.2016-06.io.spdk:cnode1 "trtype:RDMA traddr:
 
 echo "[Nvme]" > $testdir/bdevperf.conf
 echo "  TransportID \"trtype:RDMA adrfam:IPv4 subnqn:nqn.2016-06.io.spdk:cnode1 traddr:$NVMF_FIRST_TARGET_IP trsvcid:4420\" Nvme0" >> $testdir/bdevperf.conf
-$rootdir/test/lib/bdev/bdevperf/bdevperf -c $testdir/bdevperf.conf -q 128 -s 4096 -w verify -t 1
+$rootdir/test/bdev/bdevperf/bdevperf -c $testdir/bdevperf.conf -q 128 -s 4096 -w verify -t 1
 sync
 rm -rf $testdir/bdevperf.conf
 $rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode1