diff --git a/tests/qemuxml2xmloutdata/audio-alsa-best.xml b/tests/qemuxml2xmloutdata/audio-alsa-best.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/audio-alsa-best.xml
rename to tests/qemuxml2xmloutdata/audio-alsa-best.x86_64-latest.xml
index 29283ab7d2..36e4b27257 100644
--- a/tests/qemuxml2xmloutdata/audio-alsa-best.xml
+++ b/tests/qemuxml2xmloutdata/audio-alsa-best.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -21,7 +24,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/audio-alsa-full.xml b/tests/qemuxml2xmloutdata/audio-alsa-full.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/audio-alsa-full.xml
rename to tests/qemuxml2xmloutdata/audio-alsa-full.x86_64-latest.xml
index 4205ecde89..49a659de62 100644
--- a/tests/qemuxml2xmloutdata/audio-alsa-full.xml
+++ b/tests/qemuxml2xmloutdata/audio-alsa-full.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -21,7 +24,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/audio-alsa-minimal.xml b/tests/qemuxml2xmloutdata/audio-alsa-minimal.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/audio-alsa-minimal.xml
rename to tests/qemuxml2xmloutdata/audio-alsa-minimal.x86_64-latest.xml
index 57ff9d2bf0..e48452b186 100644
--- a/tests/qemuxml2xmloutdata/audio-alsa-minimal.xml
+++ b/tests/qemuxml2xmloutdata/audio-alsa-minimal.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -21,7 +24,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/audio-coreaudio-best.xml b/tests/qemuxml2xmloutdata/audio-coreaudio-best.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/audio-coreaudio-best.xml
rename to tests/qemuxml2xmloutdata/audio-coreaudio-best.x86_64-latest.xml
index d171cc752f..4fc32f5e73 100644
--- a/tests/qemuxml2xmloutdata/audio-coreaudio-best.xml
+++ b/tests/qemuxml2xmloutdata/audio-coreaudio-best.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -21,7 +24,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/audio-coreaudio-full.xml b/tests/qemuxml2xmloutdata/audio-coreaudio-full.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/audio-coreaudio-full.xml
rename to tests/qemuxml2xmloutdata/audio-coreaudio-full.x86_64-latest.xml
index b6427a6e9f..b874bbb48e 100644
--- a/tests/qemuxml2xmloutdata/audio-coreaudio-full.xml
+++ b/tests/qemuxml2xmloutdata/audio-coreaudio-full.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -21,7 +24,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/audio-coreaudio-minimal.xml b/tests/qemuxml2xmloutdata/audio-coreaudio-minimal.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/audio-coreaudio-minimal.xml
rename to tests/qemuxml2xmloutdata/audio-coreaudio-minimal.x86_64-latest.xml
index dac55ecbce..f9209782b5 100644
--- a/tests/qemuxml2xmloutdata/audio-coreaudio-minimal.xml
+++ b/tests/qemuxml2xmloutdata/audio-coreaudio-minimal.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -21,7 +24,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/audio-file-best.xml b/tests/qemuxml2xmloutdata/audio-file-best.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/audio-file-best.xml
rename to tests/qemuxml2xmloutdata/audio-file-best.x86_64-latest.xml
index 9946ad9e3d..c86beb619b 100644
--- a/tests/qemuxml2xmloutdata/audio-file-best.xml
+++ b/tests/qemuxml2xmloutdata/audio-file-best.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -21,7 +24,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/audio-file-full.xml b/tests/qemuxml2xmloutdata/audio-file-full.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/audio-file-full.xml
rename to tests/qemuxml2xmloutdata/audio-file-full.x86_64-latest.xml
index 1e4c50f44a..5479958a93 100644
--- a/tests/qemuxml2xmloutdata/audio-file-full.xml
+++ b/tests/qemuxml2xmloutdata/audio-file-full.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -21,7 +24,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/audio-file-minimal.xml b/tests/qemuxml2xmloutdata/audio-file-minimal.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/audio-file-minimal.xml
rename to tests/qemuxml2xmloutdata/audio-file-minimal.x86_64-latest.xml
index 65f2c56a90..6b6269886d 100644
--- a/tests/qemuxml2xmloutdata/audio-file-minimal.xml
+++ b/tests/qemuxml2xmloutdata/audio-file-minimal.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -21,7 +24,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/audio-jack-full.xml b/tests/qemuxml2xmloutdata/audio-jack-full.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/audio-jack-full.xml
rename to tests/qemuxml2xmloutdata/audio-jack-full.x86_64-latest.xml
index 0583a305b1..35308678e3 100644
--- a/tests/qemuxml2xmloutdata/audio-jack-full.xml
+++ b/tests/qemuxml2xmloutdata/audio-jack-full.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -21,7 +24,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/audio-none-best.xml b/tests/qemuxml2xmloutdata/audio-none-best.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/audio-none-best.xml
rename to tests/qemuxml2xmloutdata/audio-none-best.x86_64-latest.xml
index 98c3b17a84..77373cfb2b 100644
--- a/tests/qemuxml2xmloutdata/audio-none-best.xml
+++ b/tests/qemuxml2xmloutdata/audio-none-best.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -21,7 +24,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/audio-none-full.xml b/tests/qemuxml2xmloutdata/audio-none-full.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/audio-none-full.xml
rename to tests/qemuxml2xmloutdata/audio-none-full.x86_64-latest.xml
index 85437c67f2..d1383142a0 100644
--- a/tests/qemuxml2xmloutdata/audio-none-full.xml
+++ b/tests/qemuxml2xmloutdata/audio-none-full.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -21,7 +24,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/audio-none-minimal.xml b/tests/qemuxml2xmloutdata/audio-none-minimal.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/audio-none-minimal.xml
rename to tests/qemuxml2xmloutdata/audio-none-minimal.x86_64-latest.xml
index 4666777e56..8589f05399 100644
--- a/tests/qemuxml2xmloutdata/audio-none-minimal.xml
+++ b/tests/qemuxml2xmloutdata/audio-none-minimal.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -21,7 +24,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/audio-oss-best.xml b/tests/qemuxml2xmloutdata/audio-oss-best.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/audio-oss-best.xml
rename to tests/qemuxml2xmloutdata/audio-oss-best.x86_64-latest.xml
index cf0eac2fdf..b0e068c832 100644
--- a/tests/qemuxml2xmloutdata/audio-oss-best.xml
+++ b/tests/qemuxml2xmloutdata/audio-oss-best.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -21,7 +24,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/audio-oss-full.xml b/tests/qemuxml2xmloutdata/audio-oss-full.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/audio-oss-full.xml
rename to tests/qemuxml2xmloutdata/audio-oss-full.x86_64-latest.xml
index b9acccff36..c90e710681 100644
--- a/tests/qemuxml2xmloutdata/audio-oss-full.xml
+++ b/tests/qemuxml2xmloutdata/audio-oss-full.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -21,7 +24,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/audio-oss-minimal.xml b/tests/qemuxml2xmloutdata/audio-oss-minimal.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/audio-oss-minimal.xml
rename to tests/qemuxml2xmloutdata/audio-oss-minimal.x86_64-latest.xml
index 47da331bab..ce0d2cb8e7 100644
--- a/tests/qemuxml2xmloutdata/audio-oss-minimal.xml
+++ b/tests/qemuxml2xmloutdata/audio-oss-minimal.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -21,7 +24,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/audio-pulseaudio-best.xml b/tests/qemuxml2xmloutdata/audio-pulseaudio-best.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/audio-pulseaudio-best.xml
rename to tests/qemuxml2xmloutdata/audio-pulseaudio-best.x86_64-latest.xml
index 1a4609e9ed..76adca9482 100644
--- a/tests/qemuxml2xmloutdata/audio-pulseaudio-best.xml
+++ b/tests/qemuxml2xmloutdata/audio-pulseaudio-best.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -21,7 +24,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/audio-pulseaudio-full.xml b/tests/qemuxml2xmloutdata/audio-pulseaudio-full.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/audio-pulseaudio-full.xml
rename to tests/qemuxml2xmloutdata/audio-pulseaudio-full.x86_64-latest.xml
index e15098e1e8..87258c3d69 100644
--- a/tests/qemuxml2xmloutdata/audio-pulseaudio-full.xml
+++ b/tests/qemuxml2xmloutdata/audio-pulseaudio-full.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -21,7 +24,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/audio-pulseaudio-minimal.xml b/tests/qemuxml2xmloutdata/audio-pulseaudio-minimal.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/audio-pulseaudio-minimal.xml
rename to tests/qemuxml2xmloutdata/audio-pulseaudio-minimal.x86_64-latest.xml
index 6a947c0239..c53d0dc1f4 100644
--- a/tests/qemuxml2xmloutdata/audio-pulseaudio-minimal.xml
+++ b/tests/qemuxml2xmloutdata/audio-pulseaudio-minimal.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -21,7 +24,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/audio-sdl-best.xml b/tests/qemuxml2xmloutdata/audio-sdl-best.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/audio-sdl-best.xml
rename to tests/qemuxml2xmloutdata/audio-sdl-best.x86_64-latest.xml
index 84f810c61a..79a8538c86 100644
--- a/tests/qemuxml2xmloutdata/audio-sdl-best.xml
+++ b/tests/qemuxml2xmloutdata/audio-sdl-best.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -21,7 +24,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/audio-sdl-full.xml b/tests/qemuxml2xmloutdata/audio-sdl-full.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/audio-sdl-full.xml
rename to tests/qemuxml2xmloutdata/audio-sdl-full.x86_64-latest.xml
index c96182e9fb..13c6d7d1e2 100644
--- a/tests/qemuxml2xmloutdata/audio-sdl-full.xml
+++ b/tests/qemuxml2xmloutdata/audio-sdl-full.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -21,7 +24,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/audio-sdl-minimal.xml b/tests/qemuxml2xmloutdata/audio-sdl-minimal.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/audio-sdl-minimal.xml
rename to tests/qemuxml2xmloutdata/audio-sdl-minimal.x86_64-latest.xml
index 23793b6155..5bf3196a35 100644
--- a/tests/qemuxml2xmloutdata/audio-sdl-minimal.xml
+++ b/tests/qemuxml2xmloutdata/audio-sdl-minimal.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -21,7 +24,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/audio-spice-best.xml b/tests/qemuxml2xmloutdata/audio-spice-best.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/audio-spice-best.xml
rename to tests/qemuxml2xmloutdata/audio-spice-best.x86_64-latest.xml
index 80594ebca6..9017277a70 100644
--- a/tests/qemuxml2xmloutdata/audio-spice-best.xml
+++ b/tests/qemuxml2xmloutdata/audio-spice-best.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -21,7 +24,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/audio-spice-full.xml b/tests/qemuxml2xmloutdata/audio-spice-full.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/audio-spice-full.xml
rename to tests/qemuxml2xmloutdata/audio-spice-full.x86_64-latest.xml
index c9f00f8c8c..6db1f6889d 100644
--- a/tests/qemuxml2xmloutdata/audio-spice-full.xml
+++ b/tests/qemuxml2xmloutdata/audio-spice-full.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -21,7 +24,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/audio-spice-minimal.xml b/tests/qemuxml2xmloutdata/audio-spice-minimal.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/audio-spice-minimal.xml
rename to tests/qemuxml2xmloutdata/audio-spice-minimal.x86_64-latest.xml
index d5fd97b9ac..e9cba5a772 100644
--- a/tests/qemuxml2xmloutdata/audio-spice-minimal.xml
+++ b/tests/qemuxml2xmloutdata/audio-spice-minimal.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -21,7 +24,7 @@
-
+
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 93202e8e18..0f9d642730 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -1170,41 +1170,35 @@ mymain(void)
DO_TEST_NOCAPS("downscript");
/* Simplest possible