diff --git a/test/common/autotest_common.sh b/test/common/autotest_common.sh
index 25fcca5c9..591f3085d 100644
--- a/test/common/autotest_common.sh
+++ b/test/common/autotest_common.sh
@@ -416,11 +416,15 @@ function waitforbdev() {
 	local i
 
 	for ((i=1; i<=20; i++)); do
-		if ! $rpc_py bdev_get_bdevs | jq -r '.[] .name' | grep -qw $bdev_name; then
-			sleep 0.1
-		else
+		if $rpc_py bdev_get_bdevs | jq -r '.[] .name' | grep -qw $bdev_name; then
 			return 0
 		fi
+
+		if $rpc_py bdev_get_bdevs | jq -r '.[] .aliases' | grep -qw $bdev_name; then
+			return 0
+		fi
+
+		sleep 0.1
 	done
 
 	return 1