diff --git a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml
index 243b65d36fda17f3266a5db54facb90b3b9416c7..4c30761110d8749b457124c68acc047182d6027f 100644
--- a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml
+++ b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml
@@ -1,4 +1,4 @@
-<domain type='kvm' id='56'>
+<domain type='kvm'>
   <name>instance-00000092</name>
   <uuid>126f2720-6f8e-45ab-a886-ec9277079a67</uuid>
   <memory unit='KiB'>14680064</memory>
@@ -16,12 +16,20 @@
   <cpu>
     <topology sockets='8' cores='1' threads='1'/>
   </cpu>
-  <clock offset='utc' />
+  <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <memballoon model='virtio'/>
+    <controller type='usb' index='0'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
+    </controller>
+    <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
+    <memballoon model='virtio'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
+    </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology.xml b/tests/qemuxml2argvdata/fd-memory-numa-topology.xml
index ca5402dbb08369af6332fd8c95d42ea45124cb6f..f22a8e81f8e370c7f346039a71f86c8a572a720d 100644
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology.xml
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology.xml
@@ -19,12 +19,20 @@
       <cell id='0' cpus='0-7' memory='14680064' unit='KiB'/>
     </numa>
   </cpu>
-  <clock offset='utc' />
+  <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <memballoon model='virtio'/>
+    <controller type='usb' index='0'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
+    </controller>
+    <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
+    <memballoon model='virtio'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
+    </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml b/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml
index 31f4567737d4d3bd3f45fa6d712e9a834201b4bc..925f39b6abdb636690b3529e4b6cb6bcf911d245 100644
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml
@@ -1,4 +1,4 @@
-<domain type='kvm' id='56'>
+<domain type='kvm'>
   <name>instance-00000092</name>
   <uuid>126f2720-6f8e-45ab-a886-ec9277079a67</uuid>
   <memory unit='KiB'>14680064</memory>
@@ -26,6 +26,14 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <memballoon model='virtio'/>
+    <controller type='usb' index='0'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
+    </controller>
+    <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
+    <memballoon model='virtio'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
+    </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml b/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml
index 42d8a3bdadb4dae46fe3cf7728d6a617ccfa3ec3..71a8e083c94dfbead82860e2f4e6384957b63903 100644
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml
@@ -1,4 +1,4 @@
-<domain type='kvm' id='56'>
+<domain type='kvm'>
   <name>instance-00000092</name>
   <uuid>126f2720-6f8e-45ab-a886-ec9277079a67</uuid>
   <memory unit='KiB'>14680064</memory>
@@ -27,6 +27,14 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <memballoon model='virtio'/>
+    <controller type='usb' index='0'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
+    </controller>
+    <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
+    <memballoon model='virtio'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
+    </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args b/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args
index ee425a737b3a0a7d27a3ef43ed08c16520345e53..c582878a127a9fb09dab1d41db9036b7891a79da 100644
--- a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args
@@ -31,7 +31,7 @@ share=yes,size=15032385536,host-nodes=3,policy=preferred \
 -no-acpi \
 -boot strict=on \
 -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
 resourcecontrol=deny \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/memfd-memory-numa.xml b/tests/qemuxml2argvdata/memfd-memory-numa.xml
index 41c1f9bfc2e2aca12ef8b1b6a54c2f55e20f707b..f088f01d1105bc618cc837da12d66414d6a9e0e1 100644
--- a/tests/qemuxml2argvdata/memfd-memory-numa.xml
+++ b/tests/qemuxml2argvdata/memfd-memory-numa.xml
@@ -1,20 +1,20 @@
-<domain type='kvm' id='56'>
+<domain type='kvm'>
   <name>instance-00000092</name>
   <uuid>126f2720-6f8e-45ab-a886-ec9277079a67</uuid>
   <memory unit='KiB'>14680064</memory>
   <currentMemory unit='KiB'>14680064</currentMemory>
   <memoryBacking>
     <hugepages>
-        <page size="2" unit="M"/>
+      <page size='2048' unit='KiB'/>
     </hugepages>
     <source type='memfd'/>
     <access mode='shared'/>
     <allocation mode='immediate'/>
   </memoryBacking>
+  <vcpu placement='static'>8</vcpu>
   <numatune>
-      <memnode cellid='0' mode='preferred' nodeset='3'/>
+    <memnode cellid='0' mode='preferred' nodeset='3'/>
   </numatune>
-  <vcpu placement='static'>8</vcpu>
   <os>
     <type arch='x86_64' machine='pc-i440fx-wily'>hvm</type>
     <boot dev='hd'/>
@@ -31,6 +31,14 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <memballoon model='virtio'/>
+    <controller type='usb' index='0'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
+    </controller>
+    <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
+    <memballoon model='virtio'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
+    </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/fd-memory-no-numa-topology.xml b/tests/qemuxml2xmloutdata/fd-memory-no-numa-topology.xml
new file mode 120000
index 0000000000000000000000000000000000000000..4a35465bd260a228ad874ed890cb2e33b21ada22
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/fd-memory-no-numa-topology.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/fd-memory-no-numa-topology.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/fd-memory-numa-topology.xml b/tests/qemuxml2xmloutdata/fd-memory-numa-topology.xml
new file mode 120000
index 0000000000000000000000000000000000000000..6ccadd7e24418636fceddc7eaf29bb0552ad327a
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/fd-memory-numa-topology.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/fd-memory-numa-topology.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/fd-memory-numa-topology2.xml b/tests/qemuxml2xmloutdata/fd-memory-numa-topology2.xml
new file mode 120000
index 0000000000000000000000000000000000000000..9c5ab497de7c6a820c175e686207296d6ee683f5
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/fd-memory-numa-topology2.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/fd-memory-numa-topology2.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/fd-memory-numa-topology3.xml b/tests/qemuxml2xmloutdata/fd-memory-numa-topology3.xml
new file mode 120000
index 0000000000000000000000000000000000000000..40ae69bcb09efe6091f8018274993633ecaa7fdc
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/fd-memory-numa-topology3.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/fd-memory-numa-topology3.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/memfd-memory-numa.xml b/tests/qemuxml2xmloutdata/memfd-memory-numa.xml
new file mode 120000
index 0000000000000000000000000000000000000000..a610bf7a49ae74ffde783a0b349d37eef0a3a32f
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/memfd-memory-numa.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/memfd-memory-numa.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 7630587d3b79d88514cc95842a8037404b9ae5d2..057483237f509e841021fb7e9d68f544f07d366d 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -1158,6 +1158,20 @@ mymain(void)
             QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM,
             QEMU_CAPS_VIRTIO_PCI_ATS);
 
+    DO_TEST("fd-memory-numa-topology", QEMU_CAPS_OBJECT_MEMORY_FILE,
+            QEMU_CAPS_KVM);
+    DO_TEST("fd-memory-numa-topology2", QEMU_CAPS_OBJECT_MEMORY_FILE,
+            QEMU_CAPS_KVM);
+    DO_TEST("fd-memory-numa-topology3", QEMU_CAPS_OBJECT_MEMORY_FILE,
+            QEMU_CAPS_KVM);
+
+    DO_TEST("fd-memory-no-numa-topology", QEMU_CAPS_OBJECT_MEMORY_FILE,
+            QEMU_CAPS_KVM);
+
+    DO_TEST("memfd-memory-numa",
+            QEMU_CAPS_OBJECT_MEMORY_MEMFD,
+            QEMU_CAPS_OBJECT_MEMORY_MEMFD_HUGETLB);
+
     DO_TEST("acpi-table", NONE);
 
     DO_TEST("video-device-pciaddr-default",