diff --git a/arm/run b/arm/run
index c6f25b8..80ffd39 100755
--- a/arm/run
+++ b/arm/run
@@ -10,10 +10,12 @@ if [ -z "$KUT_STANDALONE" ]; then
 fi
 processor="$PROCESSOR"
 
-accel=$(get_qemu_accelerator) ||
+accel_list=($(get_qemu_accelerator)) ||
 	exit $?
+ACCEL=${accel_list[0]}
+ACCEL_PROPS=${accel_list[1]}
 
-if [ "$accel" = "kvm" ]; then
+if [ "$ACCEL" = "kvm" ]; then
 	QEMU_ARCH=$HOST
 fi
 
@@ -23,11 +25,9 @@ qemu=$(search_qemu_binary) ||
 if [ "$QEMU" ] && [ -z "$ACCEL" ] &&
    [ "$HOST" = "aarch64" ] && [ "$ARCH" = "arm" ] &&
    [ "$(basename $QEMU)" = "qemu-system-arm" ]; then
-	accel=tcg
+	ACCEL="tcg"
 fi
 
-ACCEL=$accel
-
 if ! $qemu -machine '?' | grep -q 'ARM Virtual Machine'; then
 	echo "$qemu doesn't support mach-virt ('-machine virt'). Exiting."
 	exit 2
@@ -72,7 +72,7 @@ if $qemu $M -device '?' | grep -q pci-testdev; then
 	pci_testdev="-device pci-testdev"
 fi
 
-A="-accel $ACCEL"
+A="-accel $ACCEL$ACCEL_PROPS"
 command="$qemu -nodefaults $M $A -cpu $processor $chr_testdev $pci_testdev"
 command+=" -display none -serial stdio -kernel"
 command="$(migration_cmd) $(timeout_cmd) $command"
diff --git a/powerpc/run b/powerpc/run
index ee38e07..8aa000b 100755
--- a/powerpc/run
+++ b/powerpc/run
@@ -9,8 +9,10 @@ if [ -z "$KUT_STANDALONE" ]; then
 	source scripts/arch-run.bash
 fi
 
-ACCEL=$(get_qemu_accelerator) ||
+accel_list=($(get_qemu_accelerator)) ||
 	exit $?
+ACCEL=${accel_list[0]}
+ACCEL_PROPS=${accel_list[1]}
 
 qemu=$(search_qemu_binary) ||
 	exit $?
@@ -21,7 +23,7 @@ if ! $qemu -machine '?' 2>&1 | grep 'pseries' > /dev/null; then
 fi
 
 M='-machine pseries'
-M+=",accel=$ACCEL"
+M+=",accel=$ACCEL$ACCEL_PROPS"
 command="$qemu -nodefaults $M -bios $FIRMWARE"
 command+=" -display none -serial stdio -kernel"
 command="$(migration_cmd) $(timeout_cmd) $command"
diff --git a/s390x/run b/s390x/run
index f1111db..e5d23db 100755
--- a/s390x/run
+++ b/s390x/run
@@ -9,8 +9,10 @@ if [ -z "$KUT_STANDALONE" ]; then
 	source scripts/arch-run.bash
 fi
 
-ACCEL=$(get_qemu_accelerator) ||
+accel_list=($(get_qemu_accelerator)) ||
 	exit $?
+ACCEL=${accel_list[0]}
+ACCEL_PROPS=${accel_list[1]}
 
 qemu=$(search_qemu_binary) ||
 	exit $?
@@ -26,7 +28,7 @@ if [ "${1: -7}" = ".pv.bin" ] || [ "${TESTNAME: -3}" = "_PV" ] && [ "$MIGRATION"
 fi
 
 M='-machine s390-ccw-virtio'
-M+=",accel=$ACCEL"
+M+=",accel=$ACCEL$ACCEL_PROPS"
 command="$qemu -nodefaults -nographic $M"
 command+=" -chardev stdio,id=con0 -device sclpconsole,chardev=con0"
 command+=" -kernel"
diff --git a/scripts/arch-run.bash b/scripts/arch-run.bash
index 51e4b97..12dabf9 100644
--- a/scripts/arch-run.bash
+++ b/scripts/arch-run.bash
@@ -412,22 +412,29 @@ hvf_available ()
 
 get_qemu_accelerator ()
 {
-	if [ "$ACCEL" = "kvm" ] && ! kvm_available; then
+	local accel_list
+
+	accel_list[0]=${ACCEL%%,*}
+	accel_list[1]=${ACCEL#"${accel_list[0]}"}
+
+	if [ "${accel_list[0]}" = "kvm" ] && ! kvm_available; then
 		echo "KVM is needed, but not available on this host" >&2
 		return 2
 	fi
-	if [ "$ACCEL" = "hvf" ] && ! hvf_available; then
+	if [ "${accel_list[0]}" = "hvf" ] && ! hvf_available; then
 		echo "HVF is needed, but not available on this host" >&2
 		return 2
 	fi
 
-	if [ "$ACCEL" ]; then
-		echo $ACCEL
-	elif kvm_available; then
-		echo kvm
-	elif hvf_available; then
-		echo hvf
-	else
-		echo tcg
+	if [ ! -n "${accel_list[0]}" ]; then
+		if kvm_available; then
+			accel_list[0]="kvm"
+		elif hvf_available; then
+			accel_list[0]="hvf"
+		else
+			accel_list[0]="tcg"
+		fi
 	fi
+
+	echo ${accel_list[*]}
 }
diff --git a/x86/run b/x86/run
index 4d53b72..f0b0b4a 100755
--- a/x86/run
+++ b/x86/run
@@ -9,8 +9,10 @@ if [ -z "$KUT_STANDALONE" ]; then
 	source scripts/arch-run.bash
 fi
 
-ACCEL=$(get_qemu_accelerator) ||
+accel_list=($(get_qemu_accelerator)) ||
 	exit $?
+ACCEL=${accel_list[0]}
+ACCEL_PROPS=${accel_list[1]}
 
 qemu=$(search_qemu_binary) ||
 	exit $?
@@ -38,7 +40,7 @@ else
 fi
 
 command="${qemu} --no-reboot -nodefaults $pc_testdev -vnc none -serial stdio $pci_testdev"
-command+=" -machine accel=$ACCEL"
+command+=" -machine accel=$ACCEL$ACCEL_PROPS"
 if [ "${CONFIG_EFI}" != y ]; then
 	command+=" -kernel"
 fi
