diff --git a/autotest.sh b/autotest.sh
index 887383bdd..dd5cff9d0 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -225,6 +225,7 @@ fi
 
 if [ $SPDK_TEST_RBD -eq 1 ]; then
 	run_test ./test/bdev/bdevjson/rbd_json_config.sh
+	run_test ./test/spdkcli/rbd.sh
 fi
 
 timing_enter cleanup
diff --git a/test/spdkcli/rbd.sh b/test/spdkcli/rbd.sh
new file mode 100755
index 000000000..f8d1219ee
--- /dev/null
+++ b/test/spdkcli/rbd.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+set -xe
+
+MATCH_FILE="spdkcli_rbd.test"
+testdir=$(readlink -f $(dirname $0))
+. $testdir/common.sh
+
+timing_enter spdk_cli_rbd
+trap 'on_error_exit' ERR
+timing_enter run_spdk_tgt
+run_spdk_tgt
+timing_exit run_spdk_tgt
+
+timing_enter spdkcli_create_rbd_config
+trap 'rbd_cleanup; on_error_exit' ERR
+rootdir=$(readlink -f $SPDKCLI_BUILD_DIR)
+rbd_setup 127.0.0.1
+$spdkcli_job "/bdevs/rbd create rbd foo 512" "Ceph0" True
+timing_exit spdkcli_create_rbd_config
+
+timing_enter spdkcli_check_match
+check_match
+timing_exit spdkcli_check_match
+
+timing_enter spdkcli_clear_rbd_config
+$spdkcli_job "/bdevs/rbd delete Ceph0" "Ceph0"
+rbd_cleanup
+timing_exit spdkcli_clear_rbd_config
+
+killprocess $spdk_tgt_pid
+
+timing_exit spdk_cli_rbd
+report_test_completion spdk_cli_rbd
diff --git a/test/spdkcli/spdkcli_rbd.test.match b/test/spdkcli/spdkcli_rbd.test.match
new file mode 100644
index 000000000..16723c44f
--- /dev/null
+++ b/test/spdkcli/spdkcli_rbd.test.match
@@ -0,0 +1,19 @@
+o- / ......................................................................................................................... [...]
+  o- bdevs ................................................................................................................... [...]
+  | o- aio .............................................................................................................. [Bdevs: 0]
+  | o- error ............................................................................................................ [Bdevs: 0]
+  | o- iscsi ............................................................................................................ [Bdevs: 0]
+  | o- logical_volume ................................................................................................... [Bdevs: 0]
+  | o- malloc ........................................................................................................... [Bdevs: 0]
+  | o- null ............................................................................................................. [Bdevs: 0]
+  | o- nvme ............................................................................................................. [Bdevs: 0]
+  | o- pmemblk .......................................................................................................... [Bdevs: 0]
+  | o- rbd .............................................................................................................. [Bdevs: 1]
+  | | o- Ceph0 ......................................................................................... [Size=1000.0M, Not claimed]
+  | o- split_disk ....................................................................................................... [Bdevs: 0]
+  | o- virtioblk_disk ................................................................................................... [Bdevs: 0]
+  | o- virtioscsi_disk .................................................................................................. [Bdevs: 0]
+  o- lvol_stores .................................................................................................. [Lvol stores: 0]
+  o- vhost ................................................................................................................... [...]
+    o- block ................................................................................................................. [...]
+    o- scsi .................................................................................................................. [...]