diff --git a/test/lib/bdev/Makefile b/test/lib/bdev/Makefile
index 4b872ec34..24ccd0dd6 100644
--- a/test/lib/bdev/Makefile
+++ b/test/lib/bdev/Makefile
@@ -34,7 +34,10 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-DIRS-y = bdevio bdevperf
+DIRS-y = bdevperf
+# Disable bdevio build for now - it needs to be rewritten to be
+#  event based.
+#DIRS-y = bdevio
 
 .PHONY: all clean $(DIRS-y)
 
diff --git a/test/lib/bdev/blockdev.sh b/test/lib/bdev/blockdev.sh
index 167b591f7..4055e97e1 100755
--- a/test/lib/bdev/blockdev.sh
+++ b/test/lib/bdev/blockdev.sh
@@ -10,10 +10,12 @@ testdir=$(readlink -f $(dirname $0))
 
 timing_enter blockdev
 
-timing_enter bounds
-$testdir/bdevio/bdevio $testdir/bdev.conf
-process_core
-timing_exit bounds
+# bdevio is disconnected from the build currently - it needs to be rewritten
+#  as an event-based test program.
+#timing_enter bounds
+#$testdir/bdevio/bdevio $testdir/bdev.conf
+#process_core
+#timing_exit bounds
 
 timing_enter verify
 $testdir/bdevperf/bdevperf -c $testdir/bdev.conf -q 32 -s 4096 -w verify -t 5