diff --git a/test/bdev/bdev_raid.sh b/test/bdev/bdev_raid.sh
index 43ae2f19a..3669fdb96 100755
--- a/test/bdev/bdev_raid.sh
+++ b/test/bdev/bdev_raid.sh
@@ -118,12 +118,69 @@ function raid_function_test() {
 	return 0
 }
 
+function verify_raid_bdev_state() {
+	local raid_bdev_name=$1
+	local expected_state=$2
+	local raid_level=$3
+	local strip_size=$4
+	local raid_bdev
+	local raid_bdev_info
+	local num_base_bdevs
+	local num_base_bdevs_discovered
+	local tmp
+
+	raid_bdev=$($rpc_py bdev_raid_get_bdevs all | jq -r '.[0] | select(.)')
+	if [ -z "$raid_bdev" ]; then
+		echo "No raid device in SPDK app"
+		return 1
+	fi
+
+	raid_bdev_info=$($rpc_py bdev_raid_get_bdevs $expected_state | jq -r ".[] | select(.name == \"$raid_bdev_name\")")
+	if [ -z "$raid_bdev_info" ]; then
+		echo "$raid_bdev_name is not in $expected_state state"
+		return 1
+	fi
+
+	tmp=$(echo $raid_bdev_info | jq -r '.state')
+	if [ "$tmp" != $expected_state ]; then
+		echo "incorrect state: $tmp, expected: $expected_state"
+		return 1
+	fi
+
+	tmp=$(echo $raid_bdev_info | jq -r '.raid_level')
+	if [ "$tmp" != $raid_level ]; then
+		echo "incorrect level: $tmp, expected: $raid_level"
+		return 1
+	fi
+
+	tmp=$(echo $raid_bdev_info | jq -r '.strip_size_kb')
+	if [ "$tmp" != $strip_size ]; then
+		echo "incorrect strip size: $tmp, expected: $strip_size"
+		return 1
+	fi
+
+	num_base_bdevs=$(echo $raid_bdev_info | jq -r '.base_bdevs_list | length')
+	tmp=$(echo $raid_bdev_info | jq -r '.num_base_bdevs')
+	if [ "$num_base_bdevs" != "$tmp" ]; then
+		echo "incorrect num_base_bdevs: $tmp, expected: $num_base_bdevs"
+		return 1
+	fi
+
+	num_base_bdevs_discovered=$(echo $raid_bdev_info | jq -r '[.base_bdevs_list[] | strings] | length')
+	tmp=$(echo $raid_bdev_info | jq -r '.num_base_bdevs_discovered')
+	if [ "$num_base_bdevs_discovered" != "$tmp" ]; then
+		echo "incorrect num_base_bdevs_discovered: $tmp, expected: $num_base_bdevs_discovered"
+		return 1
+	fi
+}
+
 function raid_state_function_test() {
 	local raid_level=$1
 	local raid_bdev
 	local base_bdev1="Non_Existed_Base_1"
 	local base_bdev2="Non_Existed_Base_2"
 	local raid_bdev_name="Existed_Raid"
+	local strip_size=64
 
 	$rootdir/test/app/bdev_svc/bdev_svc -r $rpc_server -i 0 -L bdev_raid &
 	raid_pid=$!
@@ -132,10 +189,8 @@ function raid_state_function_test() {
 
 	# Step1: create a RAID bdev with no base bdevs
 	# Expect state: CONFIGURING
-	$rpc_py bdev_raid_create -z 64 -r $raid_level -b "$base_bdev1 $base_bdev2" -n $raid_bdev_name
-	raid_bdev=$($rpc_py bdev_raid_get_bdevs configuring | jq -r '.[0]["name"]')
-	if [ $raid_bdev != $raid_bdev_name ]; then
-		echo "No raid device in SPDK app"
+	$rpc_py bdev_raid_create -z $strip_size -r $raid_level -b "$base_bdev1 $base_bdev2" -n $raid_bdev_name
+	if ! verify_raid_bdev_state $raid_bdev_name "configuring" $raid_level $strip_size; then
 		return 1
 	else
 		# Test: Delete the RAID bdev successfully
@@ -144,12 +199,10 @@ function raid_state_function_test() {
 
 	# Step2: create one base bdev and add to the RAID bdev
 	# Expect state: CONFIGURING
-	$rpc_py bdev_raid_create -z 64 -r $raid_level -b "$base_bdev1 $base_bdev2" -n $raid_bdev_name
+	$rpc_py bdev_raid_create -z $strip_size -r $raid_level -b "$base_bdev1 $base_bdev2" -n $raid_bdev_name
 	$rpc_py bdev_malloc_create 32 512 -b $base_bdev1
 	waitforbdev $base_bdev1
-	raid_bdev=$($rpc_py bdev_raid_get_bdevs configuring | jq -r '.[0]["name"]')
-	if [ $raid_bdev != $raid_bdev_name ]; then
-		echo "$raid_bdev_name is not in CONFIGURING state"
+	if ! verify_raid_bdev_state $raid_bdev_name "configuring" $raid_level $strip_size; then
 		$rpc_py bdev_malloc_delete $base_bdev1
 		$rpc_py bdev_raid_delete $raid_bdev_name
 		return 1
@@ -160,12 +213,10 @@ function raid_state_function_test() {
 
 	# Step3: create another base bdev and add to the RAID bdev
 	# Expect state: ONLINE
-	$rpc_py bdev_raid_create -z 64 -r $raid_level -b "$base_bdev1 $base_bdev2" -n $raid_bdev_name
+	$rpc_py bdev_raid_create -z $strip_size -r $raid_level -b "$base_bdev1 $base_bdev2" -n $raid_bdev_name
 	$rpc_py bdev_malloc_create 32 512 -b $base_bdev2
 	waitforbdev $base_bdev2
-	raid_bdev=$($rpc_py bdev_raid_get_bdevs online | jq -r '.[0]["name"]')
-	if [ $raid_bdev != $raid_bdev_name ]; then
-		echo "$raid_bdev_name is not in ONLINE state"
+	if ! verify_raid_bdev_state $raid_bdev_name "online" $raid_level $strip_size; then
 		$rpc_py bdev_malloc_delete $base_bdev1
 		$rpc_py bdev_malloc_delete $base_bdev2
 		$rpc_py bdev_raid_delete $raid_bdev_name
@@ -175,9 +226,7 @@ function raid_state_function_test() {
 	# Step4: delete one base bdev from the RAID bdev
 	# Expect state: OFFLINE
 	$rpc_py bdev_malloc_delete $base_bdev2
-	raid_bdev=$($rpc_py bdev_raid_get_bdevs offline | jq -r '.[0]["name"]')
-	if [ $raid_bdev != $raid_bdev_name ]; then
-		echo "$raid_bdev_name is not in OFFLINE state"
+	if ! verify_raid_bdev_state $raid_bdev_name "offline" $raid_level $strip_size; then
 		$rpc_py bdev_malloc_delete $base_bdev1
 		$rpc_py bdev_raid_delete $raid_bdev_name
 		return 1