diff --git a/test/lib/nvme/nvme.sh b/test/lib/nvme/nvme.sh
index 9c9d74f7e..d2d85ee2d 100755
--- a/test/lib/nvme/nvme.sh
+++ b/test/lib/nvme/nvme.sh
@@ -17,7 +17,11 @@ function get_nvme_name_from_bdf {
 	fi
 	nvme_devs=`lsblk -d --output NAME | grep "^nvme"`
 	for dev in $nvme_devs; do
-		bdf=$(basename $(readlink /sys/block/$dev/device/device))
+		link_name=$(readlink /sys/block/$dev/device/device) || true
+		if [ -z "$link_name" ]; then
+			link_name=$(readlink /sys/block/$dev/device)
+		fi
+		bdf=$(basename "$link_name")
 		if [ "$bdf" = "$1" ]; then
 			eval "$2=$dev"
 			return