diff --git a/test/common/autotest_common.sh b/test/common/autotest_common.sh
index a534a1f03..1a080e4df 100644
--- a/test/common/autotest_common.sh
+++ b/test/common/autotest_common.sh
@@ -774,11 +774,7 @@ function discover_bdevs()
 	done
 
 	# Get all of the bdevs
-	if [ -z "$rpc_server" ]; then
-		$rootdir/scripts/rpc.py bdev_get_bdevs
-	else
-		$rootdir/scripts/rpc.py -s "$rpc_server" bdev_get_bdevs
-	fi
+	$rootdir/scripts/rpc.py -s "$rpc_server" bdev_get_bdevs
 
 	# Shut down the bdev service
 	kill $stubpid