diff --git a/scripts/autotest_common.sh b/scripts/autotest_common.sh
index 6f8fed01b..7abcb9d17 100755
--- a/scripts/autotest_common.sh
+++ b/scripts/autotest_common.sh
@@ -413,7 +413,7 @@ function discover_bdevs()
 {
 	local rootdir=$1
 	local config_file=$2
-	local rpc_server=$3
+	local rpc_server=/var/tmp/spdk-discover-bdevs.sock
 
 	if [ ! -e $config_file ]; then
 		echo "Invalid Configuration File: $config_file"
@@ -422,7 +422,7 @@ function discover_bdevs()
 
 	# Start the bdev service to query for the list of available
 	# bdevs.
-	$rootdir/test/app/bdev_svc/bdev_svc -i 0 -s 1024  -c $config_file &>/dev/null &
+	$rootdir/test/app/bdev_svc/bdev_svc -r $rpc_server -i 0 -s 1024  -c $config_file &>/dev/null &
 	stubpid=$!
 	while ! [ -e /var/run/spdk_bdev0 ]; do
 		sleep 1
diff --git a/test/vhost/initiator/bdev.conf.in b/test/vhost/initiator/bdev.conf.in
index 5efa94dd6..faf6228e3 100644
--- a/test/vhost/initiator/bdev.conf.in
+++ b/test/vhost/initiator/bdev.conf.in
@@ -2,9 +2,5 @@
   Path /tmp/vhost.0
   Queues 16
 
-[Rpc]
-  Enable Yes
-  Listen /var/tmp/spdk2.sock
-
 [Ioat]
   Disable Yes
diff --git a/test/vhost/initiator/blockdev.sh b/test/vhost/initiator/blockdev.sh
index be7cb027f..f9eacd1d0 100755
--- a/test/vhost/initiator/blockdev.sh
+++ b/test/vhost/initiator/blockdev.sh
@@ -96,7 +96,7 @@ for bdev in $bdevs; do
         timing_exit bounds
 
         timing_enter bdev_svc
-        bdevs=$(discover_bdevs $rootdir $testdir/bdev.conf /var/tmp/spdk2.sock | jq -r '.[] | select(.claimed == false)')
+        bdevs=$(discover_bdevs $rootdir $testdir/bdev.conf | jq -r '.[] | select(.claimed == false)')
         timing_exit bdev_svc
 
         if [ -d /usr/src/fio ]; then