diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-aavmf-virtio-mmio.xml b/tests/qemuxml2xmloutdata/aarch64-aavmf-virtio-mmio.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-aavmf-virtio-mmio.xml
rename to tests/qemuxml2xmloutdata/aarch64-aavmf-virtio-mmio.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-default.xml b/tests/qemuxml2xmloutdata/aarch64-gic-default.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-default.xml
rename to tests/qemuxml2xmloutdata/aarch64-gic-default.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-host.xml b/tests/qemuxml2xmloutdata/aarch64-gic-host.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-host.xml
rename to tests/qemuxml2xmloutdata/aarch64-gic-host.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-both.xml b/tests/qemuxml2xmloutdata/aarch64-gic-none-both.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-both.xml
rename to tests/qemuxml2xmloutdata/aarch64-gic-none-both.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-tcg.xml b/tests/qemuxml2xmloutdata/aarch64-gic-none-tcg.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-tcg.xml
rename to tests/qemuxml2xmloutdata/aarch64-gic-none-tcg.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-v2.xml b/tests/qemuxml2xmloutdata/aarch64-gic-none-v2.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-v2.xml
rename to tests/qemuxml2xmloutdata/aarch64-gic-none-v2.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-v3.xml b/tests/qemuxml2xmloutdata/aarch64-gic-none-v3.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-v3.xml
rename to tests/qemuxml2xmloutdata/aarch64-gic-none-v3.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none.xml b/tests/qemuxml2xmloutdata/aarch64-gic-none.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none.xml
rename to tests/qemuxml2xmloutdata/aarch64-gic-none.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-v2.xml b/tests/qemuxml2xmloutdata/aarch64-gic-v2.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-v2.xml
rename to tests/qemuxml2xmloutdata/aarch64-gic-v2.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-v3.xml b/tests/qemuxml2xmloutdata/aarch64-gic-v3.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-v3.xml
rename to tests/qemuxml2xmloutdata/aarch64-gic-v3.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-pci-serial.xml b/tests/qemuxml2xmloutdata/aarch64-pci-serial.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-pci-serial.xml
rename to tests/qemuxml2xmloutdata/aarch64-pci-serial.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-video-default.xml b/tests/qemuxml2xmloutdata/aarch64-video-default.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-video-default.xml
rename to tests/qemuxml2xmloutdata/aarch64-video-default.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-video-virtio-gpu-pci.xml b/tests/qemuxml2xmloutdata/aarch64-video-virtio-gpu-pci.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-video-virtio-gpu-pci.xml
rename to tests/qemuxml2xmloutdata/aarch64-video-virtio-gpu-pci.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-virtio-pci-default.xml b/tests/qemuxml2xmloutdata/aarch64-virtio-pci-default.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-virtio-pci-default.xml
rename to tests/qemuxml2xmloutdata/aarch64-virtio-pci-default.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-virtio-pci-manual-addresses.xml b/tests/qemuxml2xmloutdata/aarch64-virtio-pci-manual-addresses.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-virtio-pci-manual-addresses.xml
rename to tests/qemuxml2xmloutdata/aarch64-virtio-pci-manual-addresses.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-acpi-table.xml b/tests/qemuxml2xmloutdata/acpi-table.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-acpi-table.xml
rename to tests/qemuxml2xmloutdata/acpi-table.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-autoindex.xml b/tests/qemuxml2xmloutdata/autoindex.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-autoindex.xml
rename to tests/qemuxml2xmloutdata/autoindex.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-balloon-device-auto.xml b/tests/qemuxml2xmloutdata/balloon-device-auto.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-balloon-device-auto.xml
rename to tests/qemuxml2xmloutdata/balloon-device-auto.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-balloon-device-period.xml b/tests/qemuxml2xmloutdata/balloon-device-period.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-balloon-device-period.xml
rename to tests/qemuxml2xmloutdata/balloon-device-period.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-bios-nvram-os-interleave.xml b/tests/qemuxml2xmloutdata/bios-nvram-os-interleave.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-bios-nvram-os-interleave.xml
rename to tests/qemuxml2xmloutdata/bios-nvram-os-interleave.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-bios-nvram.xml b/tests/qemuxml2xmloutdata/bios-nvram.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-bios-nvram.xml
rename to tests/qemuxml2xmloutdata/bios-nvram.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-blkdeviotune-group-num.xml b/tests/qemuxml2xmloutdata/blkdeviotune-group-num.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-blkdeviotune-group-num.xml
rename to tests/qemuxml2xmloutdata/blkdeviotune-group-num.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-blkdeviotune-max-length.xml b/tests/qemuxml2xmloutdata/blkdeviotune-max-length.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-blkdeviotune-max-length.xml
rename to tests/qemuxml2xmloutdata/blkdeviotune-max-length.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-blkdeviotune-max.xml b/tests/qemuxml2xmloutdata/blkdeviotune-max.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-blkdeviotune-max.xml
rename to tests/qemuxml2xmloutdata/blkdeviotune-max.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-blkdeviotune.xml b/tests/qemuxml2xmloutdata/blkdeviotune.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-blkdeviotune.xml
rename to tests/qemuxml2xmloutdata/blkdeviotune.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-blkiotune-device.xml b/tests/qemuxml2xmloutdata/blkiotune-device.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-blkiotune-device.xml
rename to tests/qemuxml2xmloutdata/blkiotune-device.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-blkiotune.xml b/tests/qemuxml2xmloutdata/blkiotune.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-blkiotune.xml
rename to tests/qemuxml2xmloutdata/blkiotune.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-cdrom.xml b/tests/qemuxml2xmloutdata/boot-cdrom.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-cdrom.xml
rename to tests/qemuxml2xmloutdata/boot-cdrom.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-floppy-q35.xml b/tests/qemuxml2xmloutdata/boot-floppy-q35.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-floppy-q35.xml
rename to tests/qemuxml2xmloutdata/boot-floppy-q35.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-floppy.xml b/tests/qemuxml2xmloutdata/boot-floppy.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-floppy.xml
rename to tests/qemuxml2xmloutdata/boot-floppy.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-menu-disable-with-timeout.xml b/tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-menu-disable-with-timeout.xml
rename to tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-menu-disable.xml b/tests/qemuxml2xmloutdata/boot-menu-disable.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-menu-disable.xml
rename to tests/qemuxml2xmloutdata/boot-menu-disable.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-menu-enable-with-timeout.xml b/tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-menu-enable-with-timeout.xml
rename to tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-multi.xml b/tests/qemuxml2xmloutdata/boot-multi.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-multi.xml
rename to tests/qemuxml2xmloutdata/boot-multi.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-network.xml b/tests/qemuxml2xmloutdata/boot-network.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-network.xml
rename to tests/qemuxml2xmloutdata/boot-network.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-order.xml b/tests/qemuxml2xmloutdata/boot-order.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-order.xml
rename to tests/qemuxml2xmloutdata/boot-order.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-bootindex-floppy-q35.xml b/tests/qemuxml2xmloutdata/bootindex-floppy-q35.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-bootindex-floppy-q35.xml
rename to tests/qemuxml2xmloutdata/bootindex-floppy-q35.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-guestfwd.xml b/tests/qemuxml2xmloutdata/channel-guestfwd.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-guestfwd.xml
rename to tests/qemuxml2xmloutdata/channel-guestfwd.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-unix-source-path.xml b/tests/qemuxml2xmloutdata/channel-unix-source-path.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-unix-source-path.xml
rename to tests/qemuxml2xmloutdata/channel-unix-source-path.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-auto.xml b/tests/qemuxml2xmloutdata/channel-virtio-auto.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-auto.xml
rename to tests/qemuxml2xmloutdata/channel-virtio-auto.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-state-active.xml b/tests/qemuxml2xmloutdata/channel-virtio-state-active.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-state-active.xml
rename to tests/qemuxml2xmloutdata/channel-virtio-state-active.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-state-inactive.xml b/tests/qemuxml2xmloutdata/channel-virtio-state-inactive.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-state-inactive.xml
rename to tests/qemuxml2xmloutdata/channel-virtio-state-inactive.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio.xml b/tests/qemuxml2xmloutdata/channel-virtio.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio.xml
rename to tests/qemuxml2xmloutdata/channel-virtio.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-chardev-label.xml b/tests/qemuxml2xmloutdata/chardev-label.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-chardev-label.xml
rename to tests/qemuxml2xmloutdata/chardev-label.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-clock-catchup.xml b/tests/qemuxml2xmloutdata/clock-catchup.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-clock-catchup.xml
rename to tests/qemuxml2xmloutdata/clock-catchup.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-clock-localtime.xml b/tests/qemuxml2xmloutdata/clock-localtime.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-clock-localtime.xml
rename to tests/qemuxml2xmloutdata/clock-localtime.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-clock-timer-hyperv-rtc.xml b/tests/qemuxml2xmloutdata/clock-timer-hyperv-rtc.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-clock-timer-hyperv-rtc.xml
rename to tests/qemuxml2xmloutdata/clock-timer-hyperv-rtc.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-clock-utc.xml b/tests/qemuxml2xmloutdata/clock-utc.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-clock-utc.xml
rename to tests/qemuxml2xmloutdata/clock-utc.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat-auto.xml b/tests/qemuxml2xmloutdata/console-compat-auto.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat-auto.xml
rename to tests/qemuxml2xmloutdata/console-compat-auto.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat.xml b/tests/qemuxml2xmloutdata/console-compat.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat.xml
rename to tests/qemuxml2xmloutdata/console-compat.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat2.xml b/tests/qemuxml2xmloutdata/console-compat2.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat2.xml
rename to tests/qemuxml2xmloutdata/console-compat2.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-virtio-many.xml b/tests/qemuxml2xmloutdata/console-virtio-many.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-console-virtio-many.xml
rename to tests/qemuxml2xmloutdata/console-virtio-many.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-virtio.xml b/tests/qemuxml2xmloutdata/console-virtio.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-console-virtio.xml
rename to tests/qemuxml2xmloutdata/console-virtio.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-controller-usb-order.xml b/tests/qemuxml2xmloutdata/controller-usb-order.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-controller-usb-order.xml
rename to tests/qemuxml2xmloutdata/controller-usb-order.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-default-none.xml b/tests/qemuxml2xmloutdata/cpu-check-default-none.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-default-none.xml
rename to tests/qemuxml2xmloutdata/cpu-check-default-none.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-default-none2.xml b/tests/qemuxml2xmloutdata/cpu-check-default-none2.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-default-none2.xml
rename to tests/qemuxml2xmloutdata/cpu-check-default-none2.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-default-partial.xml b/tests/qemuxml2xmloutdata/cpu-check-default-partial.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-default-partial.xml
rename to tests/qemuxml2xmloutdata/cpu-check-default-partial.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-default-partial2.xml b/tests/qemuxml2xmloutdata/cpu-check-default-partial2.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-default-partial2.xml
rename to tests/qemuxml2xmloutdata/cpu-check-default-partial2.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-full.xml b/tests/qemuxml2xmloutdata/cpu-check-full.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-full.xml
rename to tests/qemuxml2xmloutdata/cpu-check-full.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-none.xml b/tests/qemuxml2xmloutdata/cpu-check-none.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-none.xml
rename to tests/qemuxml2xmloutdata/cpu-check-none.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-partial.xml b/tests/qemuxml2xmloutdata/cpu-check-partial.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-partial.xml
rename to tests/qemuxml2xmloutdata/cpu-check-partial.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-empty.xml b/tests/qemuxml2xmloutdata/cpu-empty.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-empty.xml
rename to tests/qemuxml2xmloutdata/cpu-empty.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-eoi-disabled.xml b/tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-eoi-disabled.xml
rename to tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-eoi-enabled.xml b/tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-eoi-enabled.xml
rename to tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-host-kvmclock.xml b/tests/qemuxml2xmloutdata/cpu-host-kvmclock.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-host-kvmclock.xml
rename to tests/qemuxml2xmloutdata/cpu-host-kvmclock.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-host-model-features.xml b/tests/qemuxml2xmloutdata/cpu-host-model-features.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-host-model-features.xml
rename to tests/qemuxml2xmloutdata/cpu-host-model-features.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-host-passthrough-features.xml b/tests/qemuxml2xmloutdata/cpu-host-passthrough-features.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-host-passthrough-features.xml
rename to tests/qemuxml2xmloutdata/cpu-host-passthrough-features.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-kvmclock.xml b/tests/qemuxml2xmloutdata/cpu-kvmclock.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-kvmclock.xml
rename to tests/qemuxml2xmloutdata/cpu-kvmclock.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa-disjoint.xml b/tests/qemuxml2xmloutdata/cpu-numa-disjoint.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa-disjoint.xml
rename to tests/qemuxml2xmloutdata/cpu-numa-disjoint.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa-disordered.xml b/tests/qemuxml2xmloutdata/cpu-numa-disordered.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa-disordered.xml
rename to tests/qemuxml2xmloutdata/cpu-numa-disordered.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa-memshared.xml b/tests/qemuxml2xmloutdata/cpu-numa-memshared.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa-memshared.xml
rename to tests/qemuxml2xmloutdata/cpu-numa-memshared.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa-no-memory-element.xml b/tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa-no-memory-element.xml
rename to tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa1.xml b/tests/qemuxml2xmloutdata/cpu-numa1.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa1.xml
rename to tests/qemuxml2xmloutdata/cpu-numa1.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa2.xml b/tests/qemuxml2xmloutdata/cpu-numa2.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa2.xml
rename to tests/qemuxml2xmloutdata/cpu-numa2.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-iothreads.xml b/tests/qemuxml2xmloutdata/cputune-iothreads.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-iothreads.xml
rename to tests/qemuxml2xmloutdata/cputune-iothreads.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-iothreadsched-zeropriority.xml b/tests/qemuxml2xmloutdata/cputune-iothreadsched-zeropriority.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-iothreadsched-zeropriority.xml
rename to tests/qemuxml2xmloutdata/cputune-iothreadsched-zeropriority.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-iothreadsched.xml b/tests/qemuxml2xmloutdata/cputune-iothreadsched.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-iothreadsched.xml
rename to tests/qemuxml2xmloutdata/cputune-iothreadsched.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-numatune.xml b/tests/qemuxml2xmloutdata/cputune-numatune.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-numatune.xml
rename to tests/qemuxml2xmloutdata/cputune-numatune.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-zero-shares.xml b/tests/qemuxml2xmloutdata/cputune-zero-shares.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-zero-shares.xml
rename to tests/qemuxml2xmloutdata/cputune-zero-shares.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune.xml b/tests/qemuxml2xmloutdata/cputune.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune.xml
rename to tests/qemuxml2xmloutdata/cputune.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-default-kvm-host-arch.xml b/tests/qemuxml2xmloutdata/default-kvm-host-arch.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-default-kvm-host-arch.xml
rename to tests/qemuxml2xmloutdata/default-kvm-host-arch.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-default-qemu-host-arch.xml b/tests/qemuxml2xmloutdata/default-qemu-host-arch.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-default-qemu-host-arch.xml
rename to tests/qemuxml2xmloutdata/default-qemu-host-arch.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-active-commit.xml b/tests/qemuxml2xmloutdata/disk-active-commit.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-active-commit.xml
rename to tests/qemuxml2xmloutdata/disk-active-commit.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-aio.xml b/tests/qemuxml2xmloutdata/disk-aio.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-aio.xml
rename to tests/qemuxml2xmloutdata/disk-aio.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-backing-chains-active.xml b/tests/qemuxml2xmloutdata/disk-backing-chains-active.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-backing-chains-active.xml
rename to tests/qemuxml2xmloutdata/disk-backing-chains-active.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-backing-chains-inactive.xml b/tests/qemuxml2xmloutdata/disk-backing-chains-inactive.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-backing-chains-inactive.xml
rename to tests/qemuxml2xmloutdata/disk-backing-chains-inactive.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-cdrom-empty.xml b/tests/qemuxml2xmloutdata/disk-cdrom-empty.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-cdrom-empty.xml
rename to tests/qemuxml2xmloutdata/disk-cdrom-empty.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-cdrom.xml b/tests/qemuxml2xmloutdata/disk-cdrom.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-cdrom.xml
rename to tests/qemuxml2xmloutdata/disk-cdrom.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-copy_on_read.xml b/tests/qemuxml2xmloutdata/disk-copy_on_read.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-copy_on_read.xml
rename to tests/qemuxml2xmloutdata/disk-copy_on_read.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-boot-cdrom.xml b/tests/qemuxml2xmloutdata/disk-drive-boot-cdrom.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-boot-cdrom.xml
rename to tests/qemuxml2xmloutdata/disk-drive-boot-cdrom.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-boot-disk.xml b/tests/qemuxml2xmloutdata/disk-drive-boot-disk.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-boot-disk.xml
rename to tests/qemuxml2xmloutdata/disk-drive-boot-disk.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-cache-directsync.xml b/tests/qemuxml2xmloutdata/disk-drive-cache-directsync.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-cache-directsync.xml
rename to tests/qemuxml2xmloutdata/disk-drive-cache-directsync.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-cache-unsafe.xml b/tests/qemuxml2xmloutdata/disk-drive-cache-unsafe.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-cache-unsafe.xml
rename to tests/qemuxml2xmloutdata/disk-drive-cache-unsafe.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-cache-v2-none.xml b/tests/qemuxml2xmloutdata/disk-drive-cache-v2-none.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-cache-v2-none.xml
rename to tests/qemuxml2xmloutdata/disk-drive-cache-v2-none.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-cache-v2-wb.xml b/tests/qemuxml2xmloutdata/disk-drive-cache-v2-wb.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-cache-v2-wb.xml
rename to tests/qemuxml2xmloutdata/disk-drive-cache-v2-wb.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-cache-v2-wt.xml b/tests/qemuxml2xmloutdata/disk-drive-cache-v2-wt.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-cache-v2-wt.xml
rename to tests/qemuxml2xmloutdata/disk-drive-cache-v2-wt.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-copy-on-read.xml b/tests/qemuxml2xmloutdata/disk-drive-copy-on-read.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-copy-on-read.xml
rename to tests/qemuxml2xmloutdata/disk-drive-copy-on-read.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-detect-zeroes.xml b/tests/qemuxml2xmloutdata/disk-drive-detect-zeroes.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-detect-zeroes.xml
rename to tests/qemuxml2xmloutdata/disk-drive-detect-zeroes.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-discard.xml b/tests/qemuxml2xmloutdata/disk-drive-discard.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-discard.xml
rename to tests/qemuxml2xmloutdata/disk-drive-discard.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-error-policy-enospace.xml b/tests/qemuxml2xmloutdata/disk-drive-error-policy-enospace.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-error-policy-enospace.xml
rename to tests/qemuxml2xmloutdata/disk-drive-error-policy-enospace.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-error-policy-stop.xml b/tests/qemuxml2xmloutdata/disk-drive-error-policy-stop.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-error-policy-stop.xml
rename to tests/qemuxml2xmloutdata/disk-drive-error-policy-stop.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-error-policy-wreport-rignore.xml b/tests/qemuxml2xmloutdata/disk-drive-error-policy-wreport-rignore.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-error-policy-wreport-rignore.xml
rename to tests/qemuxml2xmloutdata/disk-drive-error-policy-wreport-rignore.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-fat.xml b/tests/qemuxml2xmloutdata/disk-drive-fat.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-fat.xml
rename to tests/qemuxml2xmloutdata/disk-drive-fat.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-fmt-qcow.xml b/tests/qemuxml2xmloutdata/disk-drive-fmt-qcow.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-fmt-qcow.xml
rename to tests/qemuxml2xmloutdata/disk-drive-fmt-qcow.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-gluster.xml b/tests/qemuxml2xmloutdata/disk-drive-network-gluster.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-gluster.xml
rename to tests/qemuxml2xmloutdata/disk-drive-network-gluster.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-iscsi-auth.xml b/tests/qemuxml2xmloutdata/disk-drive-network-iscsi-auth.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-iscsi-auth.xml
rename to tests/qemuxml2xmloutdata/disk-drive-network-iscsi-auth.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-iscsi.xml b/tests/qemuxml2xmloutdata/disk-drive-network-iscsi.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-iscsi.xml
rename to tests/qemuxml2xmloutdata/disk-drive-network-iscsi.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-nbd-export.xml b/tests/qemuxml2xmloutdata/disk-drive-network-nbd-export.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-nbd-export.xml
rename to tests/qemuxml2xmloutdata/disk-drive-network-nbd-export.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-nbd-ipv6-export.xml b/tests/qemuxml2xmloutdata/disk-drive-network-nbd-ipv6-export.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-nbd-ipv6-export.xml
rename to tests/qemuxml2xmloutdata/disk-drive-network-nbd-ipv6-export.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-nbd-ipv6.xml b/tests/qemuxml2xmloutdata/disk-drive-network-nbd-ipv6.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-nbd-ipv6.xml
rename to tests/qemuxml2xmloutdata/disk-drive-network-nbd-ipv6.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-nbd-unix.xml b/tests/qemuxml2xmloutdata/disk-drive-network-nbd-unix.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-nbd-unix.xml
rename to tests/qemuxml2xmloutdata/disk-drive-network-nbd-unix.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-nbd.xml b/tests/qemuxml2xmloutdata/disk-drive-network-nbd.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-nbd.xml
rename to tests/qemuxml2xmloutdata/disk-drive-network-nbd.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-rbd-auth.xml b/tests/qemuxml2xmloutdata/disk-drive-network-rbd-auth.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-rbd-auth.xml
rename to tests/qemuxml2xmloutdata/disk-drive-network-rbd-auth.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-rbd-ceph-env.xml b/tests/qemuxml2xmloutdata/disk-drive-network-rbd-ceph-env.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-rbd-ceph-env.xml
rename to tests/qemuxml2xmloutdata/disk-drive-network-rbd-ceph-env.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-rbd-ipv6.xml b/tests/qemuxml2xmloutdata/disk-drive-network-rbd-ipv6.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-rbd-ipv6.xml
rename to tests/qemuxml2xmloutdata/disk-drive-network-rbd-ipv6.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-rbd.xml b/tests/qemuxml2xmloutdata/disk-drive-network-rbd.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-rbd.xml
rename to tests/qemuxml2xmloutdata/disk-drive-network-rbd.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-sheepdog.xml b/tests/qemuxml2xmloutdata/disk-drive-network-sheepdog.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-sheepdog.xml
rename to tests/qemuxml2xmloutdata/disk-drive-network-sheepdog.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-source-auth.xml b/tests/qemuxml2xmloutdata/disk-drive-network-source-auth.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-source-auth.xml
rename to tests/qemuxml2xmloutdata/disk-drive-network-source-auth.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-tlsx509-vxhs.xml b/tests/qemuxml2xmloutdata/disk-drive-network-tlsx509-vxhs.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-tlsx509-vxhs.xml
rename to tests/qemuxml2xmloutdata/disk-drive-network-tlsx509-vxhs.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-vxhs.xml b/tests/qemuxml2xmloutdata/disk-drive-network-vxhs.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-vxhs.xml
rename to tests/qemuxml2xmloutdata/disk-drive-network-vxhs.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-floppy.xml b/tests/qemuxml2xmloutdata/disk-floppy.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-floppy.xml
rename to tests/qemuxml2xmloutdata/disk-floppy.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-many.xml b/tests/qemuxml2xmloutdata/disk-many.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-many.xml
rename to tests/qemuxml2xmloutdata/disk-many.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-mirror-active.xml b/tests/qemuxml2xmloutdata/disk-mirror-active.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-mirror-active.xml
rename to tests/qemuxml2xmloutdata/disk-mirror-active.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-mirror-inactive.xml b/tests/qemuxml2xmloutdata/disk-mirror-inactive.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-mirror-inactive.xml
rename to tests/qemuxml2xmloutdata/disk-mirror-inactive.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-mirror-old-inactive.xml b/tests/qemuxml2xmloutdata/disk-mirror-old-inactive.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-mirror-old-inactive.xml
rename to tests/qemuxml2xmloutdata/disk-mirror-old-inactive.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-mirror-old.xml b/tests/qemuxml2xmloutdata/disk-mirror-old.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-mirror-old.xml
rename to tests/qemuxml2xmloutdata/disk-mirror-old.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-device-auto.xml b/tests/qemuxml2xmloutdata/disk-scsi-device-auto.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-device-auto.xml
rename to tests/qemuxml2xmloutdata/disk-scsi-device-auto.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-device.xml b/tests/qemuxml2xmloutdata/disk-scsi-device.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-device.xml
rename to tests/qemuxml2xmloutdata/disk-scsi-device.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-disk-vpd.xml b/tests/qemuxml2xmloutdata/disk-scsi-disk-vpd.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-disk-vpd.xml
rename to tests/qemuxml2xmloutdata/disk-scsi-disk-vpd.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-lun-passthrough-sgio.xml b/tests/qemuxml2xmloutdata/disk-scsi-lun-passthrough-sgio.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-lun-passthrough-sgio.xml
rename to tests/qemuxml2xmloutdata/disk-scsi-lun-passthrough-sgio.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-megasas.xml b/tests/qemuxml2xmloutdata/disk-scsi-megasas.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-megasas.xml
rename to tests/qemuxml2xmloutdata/disk-scsi-megasas.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-mptsas1068.xml b/tests/qemuxml2xmloutdata/disk-scsi-mptsas1068.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-mptsas1068.xml
rename to tests/qemuxml2xmloutdata/disk-scsi-mptsas1068.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-virtio-scsi.xml b/tests/qemuxml2xmloutdata/disk-scsi-virtio-scsi.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-virtio-scsi.xml
rename to tests/qemuxml2xmloutdata/disk-scsi-virtio-scsi.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-vscsi.xml b/tests/qemuxml2xmloutdata/disk-scsi-vscsi.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-vscsi.xml
rename to tests/qemuxml2xmloutdata/disk-scsi-vscsi.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-serial.xml b/tests/qemuxml2xmloutdata/disk-serial.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-serial.xml
rename to tests/qemuxml2xmloutdata/disk-serial.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-source-pool-mode.xml b/tests/qemuxml2xmloutdata/disk-source-pool-mode.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-source-pool-mode.xml
rename to tests/qemuxml2xmloutdata/disk-source-pool-mode.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-source-pool.xml b/tests/qemuxml2xmloutdata/disk-source-pool.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-source-pool.xml
rename to tests/qemuxml2xmloutdata/disk-source-pool.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-usb-device.xml b/tests/qemuxml2xmloutdata/disk-usb-device.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-usb-device.xml
rename to tests/qemuxml2xmloutdata/disk-usb-device.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio-drive-queues.xml b/tests/qemuxml2xmloutdata/disk-virtio-drive-queues.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio-drive-queues.xml
rename to tests/qemuxml2xmloutdata/disk-virtio-drive-queues.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio-scsi-cmd_per_lun.xml b/tests/qemuxml2xmloutdata/disk-virtio-scsi-cmd_per_lun.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio-scsi-cmd_per_lun.xml
rename to tests/qemuxml2xmloutdata/disk-virtio-scsi-cmd_per_lun.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio-scsi-ioeventfd.xml b/tests/qemuxml2xmloutdata/disk-virtio-scsi-ioeventfd.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio-scsi-ioeventfd.xml
rename to tests/qemuxml2xmloutdata/disk-virtio-scsi-ioeventfd.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio-scsi-max_sectors.xml b/tests/qemuxml2xmloutdata/disk-virtio-scsi-max_sectors.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio-scsi-max_sectors.xml
rename to tests/qemuxml2xmloutdata/disk-virtio-scsi-max_sectors.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio-scsi-num_queues.xml b/tests/qemuxml2xmloutdata/disk-virtio-scsi-num_queues.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio-scsi-num_queues.xml
rename to tests/qemuxml2xmloutdata/disk-virtio-scsi-num_queues.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio.xml b/tests/qemuxml2xmloutdata/disk-virtio.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio.xml
rename to tests/qemuxml2xmloutdata/disk-virtio.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-encrypted-disk-usage.xml b/tests/qemuxml2xmloutdata/encrypted-disk-usage.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-encrypted-disk-usage.xml
rename to tests/qemuxml2xmloutdata/encrypted-disk-usage.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-encrypted-disk.xml b/tests/qemuxml2xmloutdata/encrypted-disk.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-encrypted-disk.xml
rename to tests/qemuxml2xmloutdata/encrypted-disk.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-eoi-disabled.xml b/tests/qemuxml2xmloutdata/eoi-disabled.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-eoi-disabled.xml
rename to tests/qemuxml2xmloutdata/eoi-disabled.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-eoi-enabled.xml b/tests/qemuxml2xmloutdata/eoi-enabled.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-eoi-enabled.xml
rename to tests/qemuxml2xmloutdata/eoi-enabled.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-event_idx.xml b/tests/qemuxml2xmloutdata/event_idx.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-event_idx.xml
rename to tests/qemuxml2xmloutdata/event_idx.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-floppy-drive-fat.xml b/tests/qemuxml2xmloutdata/floppy-drive-fat.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-floppy-drive-fat.xml
rename to tests/qemuxml2xmloutdata/floppy-drive-fat.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-listen-network.xml b/tests/qemuxml2xmloutdata/graphics-listen-network.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-listen-network.xml
rename to tests/qemuxml2xmloutdata/graphics-listen-network.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-listen-network2.xml b/tests/qemuxml2xmloutdata/graphics-listen-network2.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-listen-network2.xml
rename to tests/qemuxml2xmloutdata/graphics-listen-network2.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-sdl-fullscreen.xml b/tests/qemuxml2xmloutdata/graphics-sdl-fullscreen.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-sdl-fullscreen.xml
rename to tests/qemuxml2xmloutdata/graphics-sdl-fullscreen.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-sdl.xml b/tests/qemuxml2xmloutdata/graphics-sdl.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-sdl.xml
rename to tests/qemuxml2xmloutdata/graphics-sdl.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-auto-socket-cfg.xml b/tests/qemuxml2xmloutdata/graphics-spice-auto-socket-cfg.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-auto-socket-cfg.xml
rename to tests/qemuxml2xmloutdata/graphics-spice-auto-socket-cfg.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-auto-socket.xml b/tests/qemuxml2xmloutdata/graphics-spice-auto-socket.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-auto-socket.xml
rename to tests/qemuxml2xmloutdata/graphics-spice-auto-socket.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-compression.xml b/tests/qemuxml2xmloutdata/graphics-spice-compression.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-compression.xml
rename to tests/qemuxml2xmloutdata/graphics-spice-compression.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-qxl-vga.xml b/tests/qemuxml2xmloutdata/graphics-spice-qxl-vga.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-qxl-vga.xml
rename to tests/qemuxml2xmloutdata/graphics-spice-qxl-vga.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-socket.xml b/tests/qemuxml2xmloutdata/graphics-spice-socket.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-socket.xml
rename to tests/qemuxml2xmloutdata/graphics-spice-socket.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout.xml b/tests/qemuxml2xmloutdata/graphics-spice-timeout.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout.xml
rename to tests/qemuxml2xmloutdata/graphics-spice-timeout.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice.xml b/tests/qemuxml2xmloutdata/graphics-spice.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice.xml
rename to tests/qemuxml2xmloutdata/graphics-spice.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-auto-socket-cfg.xml b/tests/qemuxml2xmloutdata/graphics-vnc-auto-socket-cfg.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-auto-socket-cfg.xml
rename to tests/qemuxml2xmloutdata/graphics-vnc-auto-socket-cfg.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-auto-socket.xml b/tests/qemuxml2xmloutdata/graphics-vnc-auto-socket.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-auto-socket.xml
rename to tests/qemuxml2xmloutdata/graphics-vnc-auto-socket.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-no-listen-attr.xml b/tests/qemuxml2xmloutdata/graphics-vnc-no-listen-attr.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-no-listen-attr.xml
rename to tests/qemuxml2xmloutdata/graphics-vnc-no-listen-attr.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-remove-generated-socket-active.xml b/tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket-active.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-remove-generated-socket-active.xml
rename to tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket-active.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-remove-generated-socket-inactive.xml b/tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket-inactive.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-remove-generated-socket-inactive.xml
rename to tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket-inactive.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-sasl.xml b/tests/qemuxml2xmloutdata/graphics-vnc-sasl.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-sasl.xml
rename to tests/qemuxml2xmloutdata/graphics-vnc-sasl.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-socket.xml b/tests/qemuxml2xmloutdata/graphics-vnc-socket.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-socket.xml
rename to tests/qemuxml2xmloutdata/graphics-vnc-socket.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-tls.xml b/tests/qemuxml2xmloutdata/graphics-vnc-tls.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-tls.xml
rename to tests/qemuxml2xmloutdata/graphics-vnc-tls.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-websocket.xml b/tests/qemuxml2xmloutdata/graphics-vnc-websocket.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-websocket.xml
rename to tests/qemuxml2xmloutdata/graphics-vnc-websocket.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc.xml b/tests/qemuxml2xmloutdata/graphics-vnc.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc.xml
rename to tests/qemuxml2xmloutdata/graphics-vnc.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-mdev-precreated.xml b/tests/qemuxml2xmloutdata/hostdev-mdev-precreated.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-mdev-precreated.xml
rename to tests/qemuxml2xmloutdata/hostdev-mdev-precreated.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-pci-address.xml b/tests/qemuxml2xmloutdata/hostdev-pci-address.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-pci-address.xml
rename to tests/qemuxml2xmloutdata/hostdev-pci-address.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-autogen-address.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-autogen-address.xml
rename to tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-large-unit.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-large-unit.xml
rename to tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-lsi-iscsi-auth.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi-auth.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-lsi-iscsi-auth.xml
rename to tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi-auth.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-lsi-iscsi.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-lsi-iscsi.xml
rename to tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-lsi.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-lsi.xml
rename to tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-rawio.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-rawio.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-rawio.xml
rename to tests/qemuxml2xmloutdata/hostdev-scsi-rawio.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-readonly.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-readonly.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-readonly.xml
rename to tests/qemuxml2xmloutdata/hostdev-scsi-readonly.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-sgio.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-sgio.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-sgio.xml
rename to tests/qemuxml2xmloutdata/hostdev-scsi-sgio.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-shareable.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-shareable.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-shareable.xml
rename to tests/qemuxml2xmloutdata/hostdev-scsi-shareable.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-vhost-scsi-ccw.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-vhost-scsi-ccw.xml
rename to tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-vhost-scsi-pci.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-vhost-scsi-pci.xml
rename to tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-virtio-iscsi-auth.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi-auth.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-virtio-iscsi-auth.xml
rename to tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi-auth.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-virtio-iscsi.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-virtio-iscsi.xml
rename to tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-virtio-scsi.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-virtio-scsi.xml
rename to tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-usb-address.xml b/tests/qemuxml2xmloutdata/hostdev-usb-address.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-usb-address.xml
rename to tests/qemuxml2xmloutdata/hostdev-usb-address.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-vfio.xml b/tests/qemuxml2xmloutdata/hostdev-vfio.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-vfio.xml
rename to tests/qemuxml2xmloutdata/hostdev-vfio.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-memaccess.xml b/tests/qemuxml2xmloutdata/hugepages-memaccess.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-memaccess.xml
rename to tests/qemuxml2xmloutdata/hugepages-memaccess.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-memaccess2.xml b/tests/qemuxml2xmloutdata/hugepages-memaccess2.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-memaccess2.xml
rename to tests/qemuxml2xmloutdata/hugepages-memaccess2.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages.xml b/tests/qemuxml2xmloutdata/hugepages-pages.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages.xml
rename to tests/qemuxml2xmloutdata/hugepages-pages.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages2.xml b/tests/qemuxml2xmloutdata/hugepages-pages2.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages2.xml
rename to tests/qemuxml2xmloutdata/hugepages-pages2.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages3.xml b/tests/qemuxml2xmloutdata/hugepages-pages3.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages3.xml
rename to tests/qemuxml2xmloutdata/hugepages-pages3.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages4.xml b/tests/qemuxml2xmloutdata/hugepages-pages4.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages4.xml
rename to tests/qemuxml2xmloutdata/hugepages-pages4.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages5.xml b/tests/qemuxml2xmloutdata/hugepages-pages5.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages5.xml
rename to tests/qemuxml2xmloutdata/hugepages-pages5.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages6.xml b/tests/qemuxml2xmloutdata/hugepages-pages6.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages6.xml
rename to tests/qemuxml2xmloutdata/hugepages-pages6.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages7.xml b/tests/qemuxml2xmloutdata/hugepages-pages7.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages7.xml
rename to tests/qemuxml2xmloutdata/hugepages-pages7.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-shared.xml b/tests/qemuxml2xmloutdata/hugepages-shared.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-shared.xml
rename to tests/qemuxml2xmloutdata/hugepages-shared.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages.xml b/tests/qemuxml2xmloutdata/hugepages.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages.xml
rename to tests/qemuxml2xmloutdata/hugepages.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hyperv-off.xml b/tests/qemuxml2xmloutdata/hyperv-off.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hyperv-off.xml
rename to tests/qemuxml2xmloutdata/hyperv-off.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hyperv-panic.xml b/tests/qemuxml2xmloutdata/hyperv-panic.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hyperv-panic.xml
rename to tests/qemuxml2xmloutdata/hyperv-panic.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hyperv.xml b/tests/qemuxml2xmloutdata/hyperv.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-hyperv.xml
rename to tests/qemuxml2xmloutdata/hyperv.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-input-usbmouse.xml b/tests/qemuxml2xmloutdata/input-usbmouse.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-input-usbmouse.xml
rename to tests/qemuxml2xmloutdata/input-usbmouse.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-input-usbtablet.xml b/tests/qemuxml2xmloutdata/input-usbtablet.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-input-usbtablet.xml
rename to tests/qemuxml2xmloutdata/input-usbtablet.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-caching-mode.xml b/tests/qemuxml2xmloutdata/intel-iommu-caching-mode.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-caching-mode.xml
rename to tests/qemuxml2xmloutdata/intel-iommu-caching-mode.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-device-iotlb.xml b/tests/qemuxml2xmloutdata/intel-iommu-device-iotlb.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-device-iotlb.xml
rename to tests/qemuxml2xmloutdata/intel-iommu-device-iotlb.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-eim.xml b/tests/qemuxml2xmloutdata/intel-iommu-eim.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-eim.xml
rename to tests/qemuxml2xmloutdata/intel-iommu-eim.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-machine.xml b/tests/qemuxml2xmloutdata/intel-iommu-machine.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-machine.xml
rename to tests/qemuxml2xmloutdata/intel-iommu-machine.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu.xml b/tests/qemuxml2xmloutdata/intel-iommu.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu.xml
rename to tests/qemuxml2xmloutdata/intel-iommu.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-interface-driver.xml b/tests/qemuxml2xmloutdata/interface-driver.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-interface-driver.xml
rename to tests/qemuxml2xmloutdata/interface-driver.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-interface-server.xml b/tests/qemuxml2xmloutdata/interface-server.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-interface-server.xml
rename to tests/qemuxml2xmloutdata/interface-server.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-iothreads-disk-virtio-ccw.xml b/tests/qemuxml2xmloutdata/iothreads-disk-virtio-ccw.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-iothreads-disk-virtio-ccw.xml
rename to tests/qemuxml2xmloutdata/iothreads-disk-virtio-ccw.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-iothreads-disk.xml b/tests/qemuxml2xmloutdata/iothreads-disk.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-iothreads-disk.xml
rename to tests/qemuxml2xmloutdata/iothreads-disk.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-iothreads-ids-partial.xml b/tests/qemuxml2xmloutdata/iothreads-ids-partial.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-iothreads-ids-partial.xml
rename to tests/qemuxml2xmloutdata/iothreads-ids-partial.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-iothreads-ids.xml b/tests/qemuxml2xmloutdata/iothreads-ids.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-iothreads-ids.xml
rename to tests/qemuxml2xmloutdata/iothreads-ids.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-iothreads-virtio-scsi-ccw.xml b/tests/qemuxml2xmloutdata/iothreads-virtio-scsi-ccw.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-iothreads-virtio-scsi-ccw.xml
rename to tests/qemuxml2xmloutdata/iothreads-virtio-scsi-ccw.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-iothreads-virtio-scsi-pci.xml b/tests/qemuxml2xmloutdata/iothreads-virtio-scsi-pci.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-iothreads-virtio-scsi-pci.xml
rename to tests/qemuxml2xmloutdata/iothreads-virtio-scsi-pci.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-iothreads.xml b/tests/qemuxml2xmloutdata/iothreads.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-iothreads.xml
rename to tests/qemuxml2xmloutdata/iothreads.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-kvm-features-off.xml b/tests/qemuxml2xmloutdata/kvm-features-off.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-kvm-features-off.xml
rename to tests/qemuxml2xmloutdata/kvm-features-off.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-kvm-features.xml b/tests/qemuxml2xmloutdata/kvm-features.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-kvm-features.xml
rename to tests/qemuxml2xmloutdata/kvm-features.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-kvmclock.xml b/tests/qemuxml2xmloutdata/kvmclock.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-kvmclock.xml
rename to tests/qemuxml2xmloutdata/kvmclock.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-lease.xml b/tests/qemuxml2xmloutdata/lease.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-lease.xml
rename to tests/qemuxml2xmloutdata/lease.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-luks-disks-source.xml b/tests/qemuxml2xmloutdata/luks-disks-source.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-luks-disks-source.xml
rename to tests/qemuxml2xmloutdata/luks-disks-source.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-luks-disks.xml b/tests/qemuxml2xmloutdata/luks-disks.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-luks-disks.xml
rename to tests/qemuxml2xmloutdata/luks-disks.xml
diff --git a/tests/qemuxml2xmloutdata/mach-virt-console-native.xml b/tests/qemuxml2xmloutdata/mach-virt-console-native.xml
new file mode 120000
index 0000000000000000000000000000000000000000..8b64e06c7f91e3db8d0ff386220fb8c5506da3c7
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/mach-virt-console-native.xml
@@ -0,0 +1 @@
+mach-virt-serial-compat.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-console-virtio.xml b/tests/qemuxml2xmloutdata/mach-virt-console-virtio.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-console-virtio.xml
rename to tests/qemuxml2xmloutdata/mach-virt-console-virtio.xml
diff --git a/tests/qemuxml2xmloutdata/mach-virt-serial+console-native.xml b/tests/qemuxml2xmloutdata/mach-virt-serial+console-native.xml
new file mode 120000
index 0000000000000000000000000000000000000000..8b64e06c7f91e3db8d0ff386220fb8c5506da3c7
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/mach-virt-serial+console-native.xml
@@ -0,0 +1 @@
+mach-virt-serial-compat.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial-compat.xml b/tests/qemuxml2xmloutdata/mach-virt-serial-compat.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial-compat.xml
rename to tests/qemuxml2xmloutdata/mach-virt-serial-compat.xml
diff --git a/tests/qemuxml2xmloutdata/mach-virt-serial-native.xml b/tests/qemuxml2xmloutdata/mach-virt-serial-native.xml
new file mode 120000
index 0000000000000000000000000000000000000000..8b64e06c7f91e3db8d0ff386220fb8c5506da3c7
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/mach-virt-serial-native.xml
@@ -0,0 +1 @@
+mach-virt-serial-compat.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial-pci.xml b/tests/qemuxml2xmloutdata/mach-virt-serial-pci.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial-pci.xml
rename to tests/qemuxml2xmloutdata/mach-virt-serial-pci.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial-usb.xml b/tests/qemuxml2xmloutdata/mach-virt-serial-usb.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial-usb.xml
rename to tests/qemuxml2xmloutdata/mach-virt-serial-usb.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-machine-core-off.xml b/tests/qemuxml2xmloutdata/machine-core-off.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-machine-core-off.xml
rename to tests/qemuxml2xmloutdata/machine-core-off.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-machine-core-on.xml b/tests/qemuxml2xmloutdata/machine-core-on.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-machine-core-on.xml
rename to tests/qemuxml2xmloutdata/machine-core-on.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-machine-loadparm-multiple-disks-nets-s390.xml b/tests/qemuxml2xmloutdata/machine-loadparm-multiple-disks-nets-s390.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-machine-loadparm-multiple-disks-nets-s390.xml
rename to tests/qemuxml2xmloutdata/machine-loadparm-multiple-disks-nets-s390.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-memory-hotplug-dimm.xml b/tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-memory-hotplug-dimm.xml
rename to tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-memory-hotplug-nonuma.xml b/tests/qemuxml2xmloutdata/memory-hotplug-nonuma.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-memory-hotplug-nonuma.xml
rename to tests/qemuxml2xmloutdata/memory-hotplug-nonuma.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-memory-hotplug-nvdimm-access.xml b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-access.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-memory-hotplug-nvdimm-access.xml
rename to tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-access.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-memory-hotplug-nvdimm-label.xml b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-label.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-memory-hotplug-nvdimm-label.xml
rename to tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-label.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-memory-hotplug-nvdimm.xml b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-memory-hotplug-nvdimm.xml
rename to tests/qemuxml2xmloutdata/memory-hotplug-nvdimm.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-memory-hotplug.xml b/tests/qemuxml2xmloutdata/memory-hotplug.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-memory-hotplug.xml
rename to tests/qemuxml2xmloutdata/memory-hotplug.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-memorybacking-set.xml b/tests/qemuxml2xmloutdata/memorybacking-set.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-memorybacking-set.xml
rename to tests/qemuxml2xmloutdata/memorybacking-set.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-memorybacking-unset.xml b/tests/qemuxml2xmloutdata/memorybacking-unset.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-memorybacking-unset.xml
rename to tests/qemuxml2xmloutdata/memorybacking-unset.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-memtune-unlimited.xml b/tests/qemuxml2xmloutdata/memtune-unlimited.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-memtune-unlimited.xml
rename to tests/qemuxml2xmloutdata/memtune-unlimited.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-memtune.xml b/tests/qemuxml2xmloutdata/memtune.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-memtune.xml
rename to tests/qemuxml2xmloutdata/memtune.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-metadata-duplicate.xml b/tests/qemuxml2xmloutdata/metadata-duplicate.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-metadata-duplicate.xml
rename to tests/qemuxml2xmloutdata/metadata-duplicate.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-metadata.xml b/tests/qemuxml2xmloutdata/metadata.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-metadata.xml
rename to tests/qemuxml2xmloutdata/metadata.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-migrate.xml b/tests/qemuxml2xmloutdata/migrate.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-migrate.xml
rename to tests/qemuxml2xmloutdata/migrate.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-minimal.xml b/tests/qemuxml2xmloutdata/minimal.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-minimal.xml
rename to tests/qemuxml2xmloutdata/minimal.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-misc-acpi.xml b/tests/qemuxml2xmloutdata/misc-acpi.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-misc-acpi.xml
rename to tests/qemuxml2xmloutdata/misc-acpi.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-misc-disable-s3.xml b/tests/qemuxml2xmloutdata/misc-disable-s3.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-misc-disable-s3.xml
rename to tests/qemuxml2xmloutdata/misc-disable-s3.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-misc-disable-suspends.xml b/tests/qemuxml2xmloutdata/misc-disable-suspends.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-misc-disable-suspends.xml
rename to tests/qemuxml2xmloutdata/misc-disable-suspends.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-misc-enable-s4.xml b/tests/qemuxml2xmloutdata/misc-enable-s4.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-misc-enable-s4.xml
rename to tests/qemuxml2xmloutdata/misc-enable-s4.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-misc-no-reboot.xml b/tests/qemuxml2xmloutdata/misc-no-reboot.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-misc-no-reboot.xml
rename to tests/qemuxml2xmloutdata/misc-no-reboot.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-misc-uuid.xml b/tests/qemuxml2xmloutdata/misc-uuid.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-misc-uuid.xml
rename to tests/qemuxml2xmloutdata/misc-uuid.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-bandwidth.xml b/tests/qemuxml2xmloutdata/net-bandwidth.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-net-bandwidth.xml
rename to tests/qemuxml2xmloutdata/net-bandwidth.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-bandwidth2.xml b/tests/qemuxml2xmloutdata/net-bandwidth2.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-net-bandwidth2.xml
rename to tests/qemuxml2xmloutdata/net-bandwidth2.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-coalesce.xml b/tests/qemuxml2xmloutdata/net-coalesce.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-net-coalesce.xml
rename to tests/qemuxml2xmloutdata/net-coalesce.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth-hostip.xml b/tests/qemuxml2xmloutdata/net-eth-hostip.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth-hostip.xml
rename to tests/qemuxml2xmloutdata/net-eth-hostip.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth-ifname.xml b/tests/qemuxml2xmloutdata/net-eth-ifname.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth-ifname.xml
rename to tests/qemuxml2xmloutdata/net-eth-ifname.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth.xml b/tests/qemuxml2xmloutdata/net-eth.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth.xml
rename to tests/qemuxml2xmloutdata/net-eth.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-hostdev-vfio.xml b/tests/qemuxml2xmloutdata/net-hostdev-vfio.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-net-hostdev-vfio.xml
rename to tests/qemuxml2xmloutdata/net-hostdev-vfio.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-hostdev.xml b/tests/qemuxml2xmloutdata/net-hostdev.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-net-hostdev.xml
rename to tests/qemuxml2xmloutdata/net-hostdev.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-midonet.xml b/tests/qemuxml2xmloutdata/net-midonet.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-net-midonet.xml
rename to tests/qemuxml2xmloutdata/net-midonet.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-mtu.xml b/tests/qemuxml2xmloutdata/net-mtu.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-net-mtu.xml
rename to tests/qemuxml2xmloutdata/net-mtu.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-openvswitch.xml b/tests/qemuxml2xmloutdata/net-openvswitch.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-net-openvswitch.xml
rename to tests/qemuxml2xmloutdata/net-openvswitch.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-udp.xml b/tests/qemuxml2xmloutdata/net-udp.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-net-udp.xml
rename to tests/qemuxml2xmloutdata/net-udp.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-user-addr.xml b/tests/qemuxml2xmloutdata/net-user-addr.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-net-user-addr.xml
rename to tests/qemuxml2xmloutdata/net-user-addr.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-user.xml b/tests/qemuxml2xmloutdata/net-user.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-net-user.xml
rename to tests/qemuxml2xmloutdata/net-user.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-vhostuser.xml b/tests/qemuxml2xmloutdata/net-vhostuser.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-net-vhostuser.xml
rename to tests/qemuxml2xmloutdata/net-vhostuser.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-virtio-device.xml b/tests/qemuxml2xmloutdata/net-virtio-device.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-net-virtio-device.xml
rename to tests/qemuxml2xmloutdata/net-virtio-device.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-virtio-disable-offloads.xml b/tests/qemuxml2xmloutdata/net-virtio-disable-offloads.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-net-virtio-disable-offloads.xml
rename to tests/qemuxml2xmloutdata/net-virtio-disable-offloads.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-virtio-network-portgroup.xml b/tests/qemuxml2xmloutdata/net-virtio-network-portgroup.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-net-virtio-network-portgroup.xml
rename to tests/qemuxml2xmloutdata/net-virtio-network-portgroup.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-virtio-rxtxqueuesize.xml b/tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-net-virtio-rxtxqueuesize.xml
rename to tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-virtio.xml b/tests/qemuxml2xmloutdata/net-virtio.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-net-virtio.xml
rename to tests/qemuxml2xmloutdata/net-virtio.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-nographics-vga.xml b/tests/qemuxml2xmloutdata/nographics-vga.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-nographics-vga.xml
rename to tests/qemuxml2xmloutdata/nographics-vga.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-nosharepages.xml b/tests/qemuxml2xmloutdata/nosharepages.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-nosharepages.xml
rename to tests/qemuxml2xmloutdata/nosharepages.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-numad-auto-memory-vcpu-cpuset.xml b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-numad-auto-memory-vcpu-cpuset.xml
rename to tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-numad-auto-memory-vcpu-no-cpuset-and-placement.xml b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-numad-auto-memory-vcpu-no-cpuset-and-placement.xml
rename to tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-numad-auto-vcpu-no-numatune.xml b/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-numad-auto-vcpu-no-numatune.xml
rename to tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-numad-static-vcpu-no-numatune.xml b/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-numad-static-vcpu-no-numatune.xml
rename to tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-numatune-auto-prefer.xml b/tests/qemuxml2xmloutdata/numatune-auto-prefer.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-numatune-auto-prefer.xml
rename to tests/qemuxml2xmloutdata/numatune-auto-prefer.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-numatune-memnode-no-memory.xml b/tests/qemuxml2xmloutdata/numatune-memnode-no-memory.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-numatune-memnode-no-memory.xml
rename to tests/qemuxml2xmloutdata/numatune-memnode-no-memory.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-numatune-memnode.xml b/tests/qemuxml2xmloutdata/numatune-memnode.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-numatune-memnode.xml
rename to tests/qemuxml2xmloutdata/numatune-memnode.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-panic-double.xml b/tests/qemuxml2xmloutdata/panic-double.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-panic-double.xml
rename to tests/qemuxml2xmloutdata/panic-double.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-panic-isa.xml b/tests/qemuxml2xmloutdata/panic-isa.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-panic-isa.xml
rename to tests/qemuxml2xmloutdata/panic-isa.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-panic-no-address.xml b/tests/qemuxml2xmloutdata/panic-no-address.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-panic-no-address.xml
rename to tests/qemuxml2xmloutdata/panic-no-address.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-panic-pseries.xml b/tests/qemuxml2xmloutdata/panic-pseries.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-panic-pseries.xml
rename to tests/qemuxml2xmloutdata/panic-pseries.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-panic.xml b/tests/qemuxml2xmloutdata/panic.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-panic.xml
rename to tests/qemuxml2xmloutdata/panic.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-parallel-tcp.xml b/tests/qemuxml2xmloutdata/parallel-tcp.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-parallel-tcp.xml
rename to tests/qemuxml2xmloutdata/parallel-tcp.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-autoadd-addr.xml b/tests/qemuxml2xmloutdata/pci-autoadd-addr.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-autoadd-addr.xml
rename to tests/qemuxml2xmloutdata/pci-autoadd-addr.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-autoadd-idx.xml b/tests/qemuxml2xmloutdata/pci-autoadd-idx.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-autoadd-idx.xml
rename to tests/qemuxml2xmloutdata/pci-autoadd-idx.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-autofill-addr.xml b/tests/qemuxml2xmloutdata/pci-autofill-addr.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-autofill-addr.xml
rename to tests/qemuxml2xmloutdata/pci-autofill-addr.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-bridge-many-disks.xml b/tests/qemuxml2xmloutdata/pci-bridge-many-disks.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-bridge-many-disks.xml
rename to tests/qemuxml2xmloutdata/pci-bridge-many-disks.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-bridge.xml b/tests/qemuxml2xmloutdata/pci-bridge.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-bridge.xml
rename to tests/qemuxml2xmloutdata/pci-bridge.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-expander-bus.xml b/tests/qemuxml2xmloutdata/pci-expander-bus.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-expander-bus.xml
rename to tests/qemuxml2xmloutdata/pci-expander-bus.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-many.xml b/tests/qemuxml2xmloutdata/pci-many.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-many.xml
rename to tests/qemuxml2xmloutdata/pci-many.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-rom.xml b/tests/qemuxml2xmloutdata/pci-rom.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-rom.xml
rename to tests/qemuxml2xmloutdata/pci-rom.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-serial-dev-chardev.xml b/tests/qemuxml2xmloutdata/pci-serial-dev-chardev.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-serial-dev-chardev.xml
rename to tests/qemuxml2xmloutdata/pci-serial-dev-chardev.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-expander-bus.xml b/tests/qemuxml2xmloutdata/pcie-expander-bus.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-expander-bus.xml
rename to tests/qemuxml2xmloutdata/pcie-expander-bus.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-root-port-model-generic.xml b/tests/qemuxml2xmloutdata/pcie-root-port-model-generic.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-root-port-model-generic.xml
rename to tests/qemuxml2xmloutdata/pcie-root-port-model-generic.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-root-port-model-ioh3420.xml b/tests/qemuxml2xmloutdata/pcie-root-port-model-ioh3420.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-root-port-model-ioh3420.xml
rename to tests/qemuxml2xmloutdata/pcie-root-port-model-ioh3420.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-root-port.xml b/tests/qemuxml2xmloutdata/pcie-root-port.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-root-port.xml
rename to tests/qemuxml2xmloutdata/pcie-root-port.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-root.xml b/tests/qemuxml2xmloutdata/pcie-root.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-root.xml
rename to tests/qemuxml2xmloutdata/pcie-root.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-switch-downstream-port.xml b/tests/qemuxml2xmloutdata/pcie-switch-downstream-port.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-switch-downstream-port.xml
rename to tests/qemuxml2xmloutdata/pcie-switch-downstream-port.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-switch-upstream-port.xml b/tests/qemuxml2xmloutdata/pcie-switch-upstream-port.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-switch-upstream-port.xml
rename to tests/qemuxml2xmloutdata/pcie-switch-upstream-port.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pcihole64-gib.xml b/tests/qemuxml2xmloutdata/pcihole64-gib.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pcihole64-gib.xml
rename to tests/qemuxml2xmloutdata/pcihole64-gib.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pcihole64-none.xml b/tests/qemuxml2xmloutdata/pcihole64-none.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pcihole64-none.xml
rename to tests/qemuxml2xmloutdata/pcihole64-none.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pcihole64-q35.xml b/tests/qemuxml2xmloutdata/pcihole64-q35.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pcihole64-q35.xml
rename to tests/qemuxml2xmloutdata/pcihole64-q35.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pcihole64.xml b/tests/qemuxml2xmloutdata/pcihole64.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pcihole64.xml
rename to tests/qemuxml2xmloutdata/pcihole64.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pmu-feature-off.xml b/tests/qemuxml2xmloutdata/pmu-feature-off.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pmu-feature-off.xml
rename to tests/qemuxml2xmloutdata/pmu-feature-off.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pmu-feature.xml b/tests/qemuxml2xmloutdata/pmu-feature.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pmu-feature.xml
rename to tests/qemuxml2xmloutdata/pmu-feature.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-ppc64-usb-controller-legacy.xml b/tests/qemuxml2xmloutdata/ppc64-usb-controller-legacy.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-ppc64-usb-controller-legacy.xml
rename to tests/qemuxml2xmloutdata/ppc64-usb-controller-legacy.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-ppc64-usb-controller.xml b/tests/qemuxml2xmloutdata/ppc64-usb-controller.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-ppc64-usb-controller.xml
rename to tests/qemuxml2xmloutdata/ppc64-usb-controller.xml
diff --git a/tests/qemuxml2xmloutdata/pseries-console-native.xml b/tests/qemuxml2xmloutdata/pseries-console-native.xml
new file mode 120000
index 0000000000000000000000000000000000000000..0d45a892c8d78899fedd6da982a489660b7f42f7
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/pseries-console-native.xml
@@ -0,0 +1 @@
+pseries-serial-native.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-console-virtio.xml b/tests/qemuxml2xmloutdata/pseries-console-virtio.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-console-virtio.xml
rename to tests/qemuxml2xmloutdata/pseries-console-virtio.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-cpu-compat-power9.xml b/tests/qemuxml2xmloutdata/pseries-cpu-compat-power9.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-cpu-compat-power9.xml
rename to tests/qemuxml2xmloutdata/pseries-cpu-compat-power9.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-cpu-compat.xml b/tests/qemuxml2xmloutdata/pseries-cpu-compat.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-cpu-compat.xml
rename to tests/qemuxml2xmloutdata/pseries-cpu-compat.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-cpu-exact.xml b/tests/qemuxml2xmloutdata/pseries-cpu-exact.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-cpu-exact.xml
rename to tests/qemuxml2xmloutdata/pseries-cpu-exact.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-hostdevs-1.xml b/tests/qemuxml2xmloutdata/pseries-hostdevs-1.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-hostdevs-1.xml
rename to tests/qemuxml2xmloutdata/pseries-hostdevs-1.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-hostdevs-2.xml b/tests/qemuxml2xmloutdata/pseries-hostdevs-2.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-hostdevs-2.xml
rename to tests/qemuxml2xmloutdata/pseries-hostdevs-2.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-hostdevs-3.xml b/tests/qemuxml2xmloutdata/pseries-hostdevs-3.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-hostdevs-3.xml
rename to tests/qemuxml2xmloutdata/pseries-hostdevs-3.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-hpt-resizing.xml b/tests/qemuxml2xmloutdata/pseries-hpt-resizing.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-hpt-resizing.xml
rename to tests/qemuxml2xmloutdata/pseries-hpt-resizing.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-many-buses-1.xml b/tests/qemuxml2xmloutdata/pseries-many-buses-1.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-many-buses-1.xml
rename to tests/qemuxml2xmloutdata/pseries-many-buses-1.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-many-buses-2.xml b/tests/qemuxml2xmloutdata/pseries-many-buses-2.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-many-buses-2.xml
rename to tests/qemuxml2xmloutdata/pseries-many-buses-2.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-many-devices.xml b/tests/qemuxml2xmloutdata/pseries-many-devices.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-many-devices.xml
rename to tests/qemuxml2xmloutdata/pseries-many-devices.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-nvram.xml b/tests/qemuxml2xmloutdata/pseries-nvram.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-nvram.xml
rename to tests/qemuxml2xmloutdata/pseries-nvram.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-panic-missing.xml b/tests/qemuxml2xmloutdata/pseries-panic-missing.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-panic-missing.xml
rename to tests/qemuxml2xmloutdata/pseries-panic-missing.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-panic-no-address.xml b/tests/qemuxml2xmloutdata/pseries-panic-no-address.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-panic-no-address.xml
rename to tests/qemuxml2xmloutdata/pseries-panic-no-address.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-phb-default-missing.xml b/tests/qemuxml2xmloutdata/pseries-phb-default-missing.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-phb-default-missing.xml
rename to tests/qemuxml2xmloutdata/pseries-phb-default-missing.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-phb-numa-node.xml b/tests/qemuxml2xmloutdata/pseries-phb-numa-node.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-phb-numa-node.xml
rename to tests/qemuxml2xmloutdata/pseries-phb-numa-node.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-phb-simple.xml b/tests/qemuxml2xmloutdata/pseries-phb-simple.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-phb-simple.xml
rename to tests/qemuxml2xmloutdata/pseries-phb-simple.xml
diff --git a/tests/qemuxml2xmloutdata/pseries-serial+console-native.xml b/tests/qemuxml2xmloutdata/pseries-serial+console-native.xml
new file mode 120000
index 0000000000000000000000000000000000000000..0d45a892c8d78899fedd6da982a489660b7f42f7
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/pseries-serial+console-native.xml
@@ -0,0 +1 @@
+pseries-serial-native.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/pseries-serial-compat.xml b/tests/qemuxml2xmloutdata/pseries-serial-compat.xml
new file mode 120000
index 0000000000000000000000000000000000000000..0d45a892c8d78899fedd6da982a489660b7f42f7
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/pseries-serial-compat.xml
@@ -0,0 +1 @@
+pseries-serial-native.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-serial-native.xml b/tests/qemuxml2xmloutdata/pseries-serial-native.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-serial-native.xml
rename to tests/qemuxml2xmloutdata/pseries-serial-native.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-serial-pci.xml b/tests/qemuxml2xmloutdata/pseries-serial-pci.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-serial-pci.xml
rename to tests/qemuxml2xmloutdata/pseries-serial-pci.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-serial-usb.xml b/tests/qemuxml2xmloutdata/pseries-serial-usb.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-serial-usb.xml
rename to tests/qemuxml2xmloutdata/pseries-serial-usb.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pv-spinlock-disabled.xml b/tests/qemuxml2xmloutdata/pv-spinlock-disabled.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pv-spinlock-disabled.xml
rename to tests/qemuxml2xmloutdata/pv-spinlock-disabled.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pv-spinlock-enabled.xml b/tests/qemuxml2xmloutdata/pv-spinlock-enabled.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-pv-spinlock-enabled.xml
rename to tests/qemuxml2xmloutdata/pv-spinlock-enabled.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-default-devices-only.xml b/tests/qemuxml2xmloutdata/q35-default-devices-only.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-default-devices-only.xml
rename to tests/qemuxml2xmloutdata/q35-default-devices-only.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-multifunction.xml b/tests/qemuxml2xmloutdata/q35-multifunction.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-multifunction.xml
rename to tests/qemuxml2xmloutdata/q35-multifunction.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-pci-force-address.xml b/tests/qemuxml2xmloutdata/q35-pci-force-address.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-pci-force-address.xml
rename to tests/qemuxml2xmloutdata/q35-pci-force-address.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-pcie-autoadd.xml b/tests/qemuxml2xmloutdata/q35-pcie-autoadd.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-pcie-autoadd.xml
rename to tests/qemuxml2xmloutdata/q35-pcie-autoadd.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-pcie.xml b/tests/qemuxml2xmloutdata/q35-pcie.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-pcie.xml
rename to tests/qemuxml2xmloutdata/q35-pcie.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-usb2-multi.xml b/tests/qemuxml2xmloutdata/q35-usb2-multi.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-usb2-multi.xml
rename to tests/qemuxml2xmloutdata/q35-usb2-multi.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-usb2-reorder.xml b/tests/qemuxml2xmloutdata/q35-usb2-reorder.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-usb2-reorder.xml
rename to tests/qemuxml2xmloutdata/q35-usb2-reorder.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-usb2.xml b/tests/qemuxml2xmloutdata/q35-usb2.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-usb2.xml
rename to tests/qemuxml2xmloutdata/q35-usb2.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-virt-manager-basic.xml b/tests/qemuxml2xmloutdata/q35-virt-manager-basic.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-virt-manager-basic.xml
rename to tests/qemuxml2xmloutdata/q35-virt-manager-basic.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-virtio-pci.xml b/tests/qemuxml2xmloutdata/q35-virtio-pci.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-virtio-pci.xml
rename to tests/qemuxml2xmloutdata/q35-virtio-pci.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-q35.xml b/tests/qemuxml2xmloutdata/q35.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-q35.xml
rename to tests/qemuxml2xmloutdata/q35.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-qemu-ns-no-env.xml b/tests/qemuxml2xmloutdata/qemu-ns-no-env.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-qemu-ns-no-env.xml
rename to tests/qemuxml2xmloutdata/qemu-ns-no-env.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-console-native.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-console-native.xml
deleted file mode 120000
index a4768fcf86280024f0936b68f3bfc98afd466d7c..0000000000000000000000000000000000000000
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-console-native.xml
+++ /dev/null
@@ -1 +0,0 @@
-qemuxml2xmlout-mach-virt-serial-compat.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial+console-native.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial+console-native.xml
deleted file mode 120000
index a4768fcf86280024f0936b68f3bfc98afd466d7c..0000000000000000000000000000000000000000
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial+console-native.xml
+++ /dev/null
@@ -1 +0,0 @@
-qemuxml2xmlout-mach-virt-serial-compat.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial-native.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial-native.xml
deleted file mode 120000
index a4768fcf86280024f0936b68f3bfc98afd466d7c..0000000000000000000000000000000000000000
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial-native.xml
+++ /dev/null
@@ -1 +0,0 @@
-qemuxml2xmlout-mach-virt-serial-compat.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-console-native.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-console-native.xml
deleted file mode 120000
index b0e645fc03e7cf18a1ed2b26e7caecc1b5bca6cf..0000000000000000000000000000000000000000
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-console-native.xml
+++ /dev/null
@@ -1 +0,0 @@
-qemuxml2xmlout-pseries-serial-native.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-serial+console-native.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-serial+console-native.xml
deleted file mode 120000
index b0e645fc03e7cf18a1ed2b26e7caecc1b5bca6cf..0000000000000000000000000000000000000000
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-serial+console-native.xml
+++ /dev/null
@@ -1 +0,0 @@
-qemuxml2xmlout-pseries-serial-native.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-serial-compat.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-serial-compat.xml
deleted file mode 120000
index b0e645fc03e7cf18a1ed2b26e7caecc1b5bca6cf..0000000000000000000000000000000000000000
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-serial-compat.xml
+++ /dev/null
@@ -1 +0,0 @@
-qemuxml2xmlout-pseries-serial-native.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-reboot-timeout-disabled.xml b/tests/qemuxml2xmloutdata/reboot-timeout-disabled.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-reboot-timeout-disabled.xml
rename to tests/qemuxml2xmloutdata/reboot-timeout-disabled.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-reboot-timeout-enabled.xml b/tests/qemuxml2xmloutdata/reboot-timeout-enabled.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-reboot-timeout-enabled.xml
rename to tests/qemuxml2xmloutdata/reboot-timeout-enabled.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-restore-v2.xml b/tests/qemuxml2xmloutdata/restore-v2.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-restore-v2.xml
rename to tests/qemuxml2xmloutdata/restore-v2.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-defaultconsole.xml b/tests/qemuxml2xmloutdata/s390-defaultconsole.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-defaultconsole.xml
rename to tests/qemuxml2xmloutdata/s390-defaultconsole.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-panic-missing.xml b/tests/qemuxml2xmloutdata/s390-panic-missing.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-panic-missing.xml
rename to tests/qemuxml2xmloutdata/s390-panic-missing.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-panic-no-address.xml b/tests/qemuxml2xmloutdata/s390-panic-no-address.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-panic-no-address.xml
rename to tests/qemuxml2xmloutdata/s390-panic-no-address.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-panic.xml b/tests/qemuxml2xmloutdata/s390-panic.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-panic.xml
rename to tests/qemuxml2xmloutdata/s390-panic.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-serial-2.xml b/tests/qemuxml2xmloutdata/s390-serial-2.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-serial-2.xml
rename to tests/qemuxml2xmloutdata/s390-serial-2.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-serial-console.xml b/tests/qemuxml2xmloutdata/s390-serial-console.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-serial-console.xml
rename to tests/qemuxml2xmloutdata/s390-serial-console.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-serial.xml b/tests/qemuxml2xmloutdata/s390-serial.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-serial.xml
rename to tests/qemuxml2xmloutdata/s390-serial.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-dac-none.xml b/tests/qemuxml2xmloutdata/seclabel-dac-none.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-dac-none.xml
rename to tests/qemuxml2xmloutdata/seclabel-dac-none.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-device-multiple.xml b/tests/qemuxml2xmloutdata/seclabel-device-multiple.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-device-multiple.xml
rename to tests/qemuxml2xmloutdata/seclabel-device-multiple.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-dynamic-baselabel.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-dynamic-baselabel.xml
rename to tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-dynamic-labelskip.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-dynamic-labelskip.xml
rename to tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-dynamic-none-relabel.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-none-relabel.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-dynamic-none-relabel.xml
rename to tests/qemuxml2xmloutdata/seclabel-dynamic-none-relabel.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-dynamic-none.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-dynamic-none.xml
rename to tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-dynamic-override.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-override.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-dynamic-override.xml
rename to tests/qemuxml2xmloutdata/seclabel-dynamic-override.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-dynamic-relabel.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-relabel.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-dynamic-relabel.xml
rename to tests/qemuxml2xmloutdata/seclabel-dynamic-relabel.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-none.xml b/tests/qemuxml2xmloutdata/seclabel-none.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-none.xml
rename to tests/qemuxml2xmloutdata/seclabel-none.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-static-labelskip.xml b/tests/qemuxml2xmloutdata/seclabel-static-labelskip.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-static-labelskip.xml
rename to tests/qemuxml2xmloutdata/seclabel-static-labelskip.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-static.xml b/tests/qemuxml2xmloutdata/seclabel-static.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-static.xml
rename to tests/qemuxml2xmloutdata/seclabel-static.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-dev.xml b/tests/qemuxml2xmloutdata/serial-dev.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-dev.xml
rename to tests/qemuxml2xmloutdata/serial-dev.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-file.xml b/tests/qemuxml2xmloutdata/serial-file.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-file.xml
rename to tests/qemuxml2xmloutdata/serial-file.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-many.xml b/tests/qemuxml2xmloutdata/serial-many.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-many.xml
rename to tests/qemuxml2xmloutdata/serial-many.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-pty.xml b/tests/qemuxml2xmloutdata/serial-pty.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-pty.xml
rename to tests/qemuxml2xmloutdata/serial-pty.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-spiceport-nospice.xml b/tests/qemuxml2xmloutdata/serial-spiceport-nospice.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-spiceport-nospice.xml
rename to tests/qemuxml2xmloutdata/serial-spiceport-nospice.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-spiceport.xml b/tests/qemuxml2xmloutdata/serial-spiceport.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-spiceport.xml
rename to tests/qemuxml2xmloutdata/serial-spiceport.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-target-port-auto.xml b/tests/qemuxml2xmloutdata/serial-target-port-auto.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-target-port-auto.xml
rename to tests/qemuxml2xmloutdata/serial-target-port-auto.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-tcp-telnet.xml b/tests/qemuxml2xmloutdata/serial-tcp-telnet.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-tcp-telnet.xml
rename to tests/qemuxml2xmloutdata/serial-tcp-telnet.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-tcp-tlsx509-chardev-notls.xml b/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev-notls.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-tcp-tlsx509-chardev-notls.xml
rename to tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev-notls.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-tcp-tlsx509-chardev.xml b/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-tcp-tlsx509-chardev.xml
rename to tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-tcp.xml b/tests/qemuxml2xmloutdata/serial-tcp.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-tcp.xml
rename to tests/qemuxml2xmloutdata/serial-tcp.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-udp.xml b/tests/qemuxml2xmloutdata/serial-udp.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-udp.xml
rename to tests/qemuxml2xmloutdata/serial-udp.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-unix.xml b/tests/qemuxml2xmloutdata/serial-unix.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-unix.xml
rename to tests/qemuxml2xmloutdata/serial-unix.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-vc.xml b/tests/qemuxml2xmloutdata/serial-vc.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-vc.xml
rename to tests/qemuxml2xmloutdata/serial-vc.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-shmem-plain-doorbell.xml b/tests/qemuxml2xmloutdata/shmem-plain-doorbell.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-shmem-plain-doorbell.xml
rename to tests/qemuxml2xmloutdata/shmem-plain-doorbell.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-shmem.xml b/tests/qemuxml2xmloutdata/shmem.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-shmem.xml
rename to tests/qemuxml2xmloutdata/shmem.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-smartcard-controller.xml b/tests/qemuxml2xmloutdata/smartcard-controller.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-smartcard-controller.xml
rename to tests/qemuxml2xmloutdata/smartcard-controller.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-smartcard-host-certificates.xml b/tests/qemuxml2xmloutdata/smartcard-host-certificates.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-smartcard-host-certificates.xml
rename to tests/qemuxml2xmloutdata/smartcard-host-certificates.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-smartcard-host.xml b/tests/qemuxml2xmloutdata/smartcard-host.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-smartcard-host.xml
rename to tests/qemuxml2xmloutdata/smartcard-host.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-smartcard-passthrough-spicevmc.xml b/tests/qemuxml2xmloutdata/smartcard-passthrough-spicevmc.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-smartcard-passthrough-spicevmc.xml
rename to tests/qemuxml2xmloutdata/smartcard-passthrough-spicevmc.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-smartcard-passthrough-tcp.xml b/tests/qemuxml2xmloutdata/smartcard-passthrough-tcp.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-smartcard-passthrough-tcp.xml
rename to tests/qemuxml2xmloutdata/smartcard-passthrough-tcp.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-smbios-multiple-type2.xml b/tests/qemuxml2xmloutdata/smbios-multiple-type2.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-smbios-multiple-type2.xml
rename to tests/qemuxml2xmloutdata/smbios-multiple-type2.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-smbios.xml b/tests/qemuxml2xmloutdata/smbios.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-smbios.xml
rename to tests/qemuxml2xmloutdata/smbios.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-smp.xml b/tests/qemuxml2xmloutdata/smp.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-smp.xml
rename to tests/qemuxml2xmloutdata/smp.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-sound-device.xml b/tests/qemuxml2xmloutdata/sound-device.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-sound-device.xml
rename to tests/qemuxml2xmloutdata/sound-device.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-sound.xml b/tests/qemuxml2xmloutdata/sound.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-sound.xml
rename to tests/qemuxml2xmloutdata/sound.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-tap-vhost-incorrect.xml b/tests/qemuxml2xmloutdata/tap-vhost-incorrect.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-tap-vhost-incorrect.xml
rename to tests/qemuxml2xmloutdata/tap-vhost-incorrect.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-tap-vhost.xml b/tests/qemuxml2xmloutdata/tap-vhost.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-tap-vhost.xml
rename to tests/qemuxml2xmloutdata/tap-vhost.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-tpm-passthrough.xml b/tests/qemuxml2xmloutdata/tpm-passthrough.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-tpm-passthrough.xml
rename to tests/qemuxml2xmloutdata/tpm-passthrough.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-controller-default-q35.xml b/tests/qemuxml2xmloutdata/usb-controller-default-q35.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-controller-default-q35.xml
rename to tests/qemuxml2xmloutdata/usb-controller-default-q35.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-controller-explicit-q35.xml b/tests/qemuxml2xmloutdata/usb-controller-explicit-q35.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-controller-explicit-q35.xml
rename to tests/qemuxml2xmloutdata/usb-controller-explicit-q35.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-controller.xml b/tests/qemuxml2xmloutdata/usb-controller.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-controller.xml
rename to tests/qemuxml2xmloutdata/usb-controller.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-ich9-ehci-addr.xml b/tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-ich9-ehci-addr.xml
rename to tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-none.xml b/tests/qemuxml2xmloutdata/usb-none.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-none.xml
rename to tests/qemuxml2xmloutdata/usb-none.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-piix3-controller.xml b/tests/qemuxml2xmloutdata/usb-piix3-controller.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-piix3-controller.xml
rename to tests/qemuxml2xmloutdata/usb-piix3-controller.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-port-missing.xml b/tests/qemuxml2xmloutdata/usb-port-missing.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-port-missing.xml
rename to tests/qemuxml2xmloutdata/usb-port-missing.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-redir-filter-version.xml b/tests/qemuxml2xmloutdata/usb-redir-filter-version.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-redir-filter-version.xml
rename to tests/qemuxml2xmloutdata/usb-redir-filter-version.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-redir-filter.xml b/tests/qemuxml2xmloutdata/usb-redir-filter.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-redir-filter.xml
rename to tests/qemuxml2xmloutdata/usb-redir-filter.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-redir.xml b/tests/qemuxml2xmloutdata/usb-redir.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-redir.xml
rename to tests/qemuxml2xmloutdata/usb-redir.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-user-aliases.xml b/tests/qemuxml2xmloutdata/user-aliases.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-user-aliases.xml
rename to tests/qemuxml2xmloutdata/user-aliases.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-vcpu-placement-static.xml b/tests/qemuxml2xmloutdata/vcpu-placement-static.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-vcpu-placement-static.xml
rename to tests/qemuxml2xmloutdata/vcpu-placement-static.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-vhost_queues.xml b/tests/qemuxml2xmloutdata/vhost_queues.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-vhost_queues.xml
rename to tests/qemuxml2xmloutdata/vhost_queues.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-video-device-pciaddr-default.xml b/tests/qemuxml2xmloutdata/video-device-pciaddr-default.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-video-device-pciaddr-default.xml
rename to tests/qemuxml2xmloutdata/video-device-pciaddr-default.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-video-qxl-heads.xml b/tests/qemuxml2xmloutdata/video-qxl-heads.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-video-qxl-heads.xml
rename to tests/qemuxml2xmloutdata/video-qxl-heads.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-video-qxl-noheads.xml b/tests/qemuxml2xmloutdata/video-qxl-noheads.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-video-qxl-noheads.xml
rename to tests/qemuxml2xmloutdata/video-qxl-noheads.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-video-virtio-gpu-device.xml b/tests/qemuxml2xmloutdata/video-virtio-gpu-device.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-video-virtio-gpu-device.xml
rename to tests/qemuxml2xmloutdata/video-virtio-gpu-device.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-video-virtio-gpu-secondary.xml b/tests/qemuxml2xmloutdata/video-virtio-gpu-secondary.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-video-virtio-gpu-secondary.xml
rename to tests/qemuxml2xmloutdata/video-virtio-gpu-secondary.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-video-virtio-gpu-spice-gl.xml b/tests/qemuxml2xmloutdata/video-virtio-gpu-spice-gl.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-video-virtio-gpu-spice-gl.xml
rename to tests/qemuxml2xmloutdata/video-virtio-gpu-spice-gl.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-video-virtio-gpu-virgl.xml b/tests/qemuxml2xmloutdata/video-virtio-gpu-virgl.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-video-virtio-gpu-virgl.xml
rename to tests/qemuxml2xmloutdata/video-virtio-gpu-virgl.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-input-passthrough.xml b/tests/qemuxml2xmloutdata/virtio-input-passthrough.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-input-passthrough.xml
rename to tests/qemuxml2xmloutdata/virtio-input-passthrough.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-input.xml b/tests/qemuxml2xmloutdata/virtio-input.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-input.xml
rename to tests/qemuxml2xmloutdata/virtio-input.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-lun.xml b/tests/qemuxml2xmloutdata/virtio-lun.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-lun.xml
rename to tests/qemuxml2xmloutdata/virtio-lun.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-options.xml b/tests/qemuxml2xmloutdata/virtio-options.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-options.xml
rename to tests/qemuxml2xmloutdata/virtio-options.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-rng-egd.xml b/tests/qemuxml2xmloutdata/virtio-rng-egd.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-rng-egd.xml
rename to tests/qemuxml2xmloutdata/virtio-rng-egd.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-rng-random.xml b/tests/qemuxml2xmloutdata/virtio-rng-random.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-rng-random.xml
rename to tests/qemuxml2xmloutdata/virtio-rng-random.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-vmcoreinfo.xml b/tests/qemuxml2xmloutdata/vmcoreinfo.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-vmcoreinfo.xml
rename to tests/qemuxml2xmloutdata/vmcoreinfo.xml
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-watchdog.xml b/tests/qemuxml2xmloutdata/watchdog.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-watchdog.xml
rename to tests/qemuxml2xmloutdata/watchdog.xml
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index a930adf646d15992a66720f799ba04b366fa3205..2be8eb2c15324a3cb0cc3fccd0ad732b8152aed1 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -312,7 +312,7 @@ testInfoSet(struct testInfo *info,
 
     if (when & WHEN_INACTIVE) {
         if (virAsprintf(&info->outInactiveName,
-                        "%s/qemuxml2xmloutdata/qemuxml2xmlout-%s-inactive.xml",
+                        "%s/qemuxml2xmloutdata/%s-inactive.xml",
                         abs_srcdir, name) < 0)
             goto error;
 
@@ -320,7 +320,7 @@ testInfoSet(struct testInfo *info,
             VIR_FREE(info->outInactiveName);
 
             if (virAsprintf(&info->outInactiveName,
-                            "%s/qemuxml2xmloutdata/qemuxml2xmlout-%s.xml",
+                            "%s/qemuxml2xmloutdata/%s.xml",
                             abs_srcdir, name) < 0)
                 goto error;
         }
@@ -328,7 +328,7 @@ testInfoSet(struct testInfo *info,
 
     if (when & WHEN_ACTIVE) {
         if (virAsprintf(&info->outActiveName,
-                        "%s/qemuxml2xmloutdata/qemuxml2xmlout-%s-active.xml",
+                        "%s/qemuxml2xmloutdata/%s-active.xml",
                         abs_srcdir, name) < 0)
             goto error;
 
@@ -336,7 +336,7 @@ testInfoSet(struct testInfo *info,
             VIR_FREE(info->outActiveName);
 
             if (virAsprintf(&info->outActiveName,
-                            "%s/qemuxml2xmloutdata/qemuxml2xmlout-%s.xml",
+                            "%s/qemuxml2xmloutdata/%s.xml",
                             abs_srcdir, name) < 0)
                 goto error;
         }