diff --git a/test/ocf/common.sh b/test/ocf/common.sh
index 7bc8bcef5..970ec0575 100644
--- a/test/ocf/common.sh
+++ b/test/ocf/common.sh
@@ -13,15 +13,15 @@ function nvme_cfg() {
 
 function clear_nvme()
 {
-	bdf=$($rootdir/scripts/gen_nvme.sh --json | jq '.config[0].params.traddr' | sed s/\"//g)
+	mapfile -t bdf < <(iter_all_pci_class_code 01 08 02)
 
 	# Clear metadata on NVMe device
 	$rootdir/scripts/setup.sh reset
 	sleep 5
-	name=$(get_nvme_name_from_bdf $bdf)
+
+	name=$(get_nvme_name_from_bdf "${bdf[0]}")
 	mountpoints=$(lsblk /dev/$name --output MOUNTPOINT -n | wc -w)
 	if [ "$mountpoints" != "0" ]; then
-		$rootdir/scripts/setup.sh
 		exit 1
 	fi
 	dd if=/dev/zero of=/dev/$name bs=1M count=1000 oflag=direct