diff --git a/tests/Makefile.am b/tests/Makefile.am
index 811d79df0d..5714d11571 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -121,7 +121,8 @@ EXTRA_DIST =		\
 	qemucapabilitiesdata \
 	qemucaps2xmldata \
 	qemuhelpdata \
-	qemuhotplugtestdata \
+	qemuhotplugtestdevices \
+	qemuhotplugtestdomains \
 	qemumonitorjsondata \
 	qemuxml2argvdata \
 	qemuxml2xmloutdata \
diff --git a/tests/qemuhotplugtestdata/qemuhotplug-base+qemu-agent-detach.xml b/tests/qemuhotplugtestdata/qemuhotplug-base+qemu-agent-detach.xml
deleted file mode 100644
index 2c449f1d49..0000000000
--- a/tests/qemuhotplugtestdata/qemuhotplug-base+qemu-agent-detach.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<domain type='kvm' id='7'>
-  <name>hotplug</name>
-  <uuid>d091ea82-29e6-2e34-3005-f02617b36e87</uuid>
-  <memory unit='KiB'>4194304</memory>
-  <currentMemory unit='KiB'>4194304</currentMemory>
-  <vcpu placement='static'>4</vcpu>
-  <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <pae/>
-  </features>
-  <clock offset='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/libexec/qemu-kvm</emulator>
-    <controller type='usb' index='0'>
-      <alias name='usb'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
-    </controller>
-    <controller type='ide' index='0'>
-      <alias name='ide'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
-    </controller>
-    <controller type='scsi' index='0' model='virtio-scsi'>
-      <alias name='scsi0'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
-    </controller>
-    <controller type='pci' index='0' model='pci-root'>
-      <alias name='pci'/>
-    </controller>
-    <controller type='virtio-serial' index='0'>
-      <alias name='virtio-serial0'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
-    </controller>
-    <channel type='unix'>
-      <source mode='bind' path='/var/lib/libvirt/qemu/channel/target/domain-7-hotplug/org.qemu.guest_agent.0'/>
-      <target type='virtio' name='org.qemu.guest_agent.0'/>
-      <alias name='channel0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='1'/>
-    </channel>
-    <input type='mouse' bus='ps2'>
-      <alias name='input0'/>
-    </input>
-    <input type='keyboard' bus='ps2'>
-      <alias name='input1'/>
-    </input>
-    <memballoon model='none'>
-      <alias name='balloon0'/>
-    </memballoon>
-  </devices>
-  <seclabel type='none' model='none'/>
-</domain>
diff --git a/tests/qemuhotplugtestdata/qemuhotplug-base+qemu-agent.xml b/tests/qemuhotplugtestdata/qemuhotplug-base+qemu-agent.xml
deleted file mode 100644
index 47fc9708ac..0000000000
--- a/tests/qemuhotplugtestdata/qemuhotplug-base+qemu-agent.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<domain type='kvm' id='7'>
-  <name>hotplug</name>
-  <uuid>d091ea82-29e6-2e34-3005-f02617b36e87</uuid>
-  <memory unit='KiB'>4194304</memory>
-  <currentMemory unit='KiB'>4194304</currentMemory>
-  <vcpu placement='static'>4</vcpu>
-  <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <pae/>
-  </features>
-  <clock offset='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/libexec/qemu-kvm</emulator>
-    <controller type='usb' index='0'>
-      <alias name='usb'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
-    </controller>
-    <controller type='ide' index='0'>
-      <alias name='ide'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
-    </controller>
-    <controller type='scsi' index='0' model='virtio-scsi'>
-      <alias name='scsi0'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
-    </controller>
-    <controller type='pci' index='0' model='pci-root'>
-      <alias name='pci'/>
-    </controller>
-    <controller type='virtio-serial' index='0'>
-      <alias name='virtio-serial0'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
-    </controller>
-    <channel type='unix'>
-      <source mode='bind' path='/tmp/channel/domain-7-hotplug/org.qemu.guest_agent.0'/>
-      <target type='virtio' name='org.qemu.guest_agent.0'/>
-      <alias name='channel0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='1'/>
-    </channel>
-    <input type='mouse' bus='ps2'>
-      <alias name='input0'/>
-    </input>
-    <input type='keyboard' bus='ps2'>
-      <alias name='input1'/>
-    </input>
-    <memballoon model='none'>
-      <alias name='balloon0'/>
-    </memballoon>
-  </devices>
-  <seclabel type='none' model='none'/>
-</domain>