diff --git a/tests/capabilityschemadata/caps-qemu-kvm.xml b/tests/capabilityschemadata/caps-qemu-kvm.xml
index a70e1a457b..47accde9dd 100644
--- a/tests/capabilityschemadata/caps-qemu-kvm.xml
+++ b/tests/capabilityschemadata/caps-qemu-kvm.xml
@@ -2,8 +2,30 @@
 
   <host>
     <cpu>
-      <arch>i686</arch>
+      <arch>x86_64</arch>
     </cpu>
+    <migration_features>
+      <live/>
+      <uri_transports>
+        <uri_transport>tcp</uri_transport>
+      </uri_transports>
+    </migration_features>
+    <topology>
+      <cells num='1'>
+        <cell id='0'>
+          <cpus num='4'>
+            <cpu id='0'/>
+            <cpu id='1'/>
+            <cpu id='2'/>
+            <cpu id='3'/>
+          </cpus>
+        </cell>
+      </cells>
+    </topology>
+    <secmodel>
+      <model>selinux</model>
+      <doi>0</doi>
+    </secmodel>
   </host>
 
   <guest>
@@ -11,12 +33,18 @@
     <arch name='i686'>
       <wordsize>32</wordsize>
       <emulator>/usr/bin/qemu</emulator>
-      <machine>pc</machine>
+      <machine>pc-0.11</machine>
+      <machine canonical='pc-0.11'>pc</machine>
+      <machine>pc-0.10</machine>
       <machine>isapc</machine>
       <domain type='qemu'>
       </domain>
       <domain type='kvm'>
         <emulator>/usr/bin/qemu-kvm</emulator>
+        <machine>pc-0.11</machine>
+        <machine canonical='pc-0.11'>pc</machine>
+        <machine>pc-0.10</machine>
+        <machine>isapc</machine>
       </domain>
     </arch>
     <features>
@@ -32,10 +60,19 @@
     <arch name='x86_64'>
       <wordsize>64</wordsize>
       <emulator>/usr/bin/qemu-system-x86_64</emulator>
-      <machine>pc</machine>
+      <machine>pc-0.11</machine>
+      <machine canonical='pc-0.11'>pc</machine>
+      <machine>pc-0.10</machine>
       <machine>isapc</machine>
       <domain type='qemu'>
       </domain>
+      <domain type='kvm'>
+        <emulator>/usr/bin/qemu-kvm</emulator>
+        <machine>pc-0.11</machine>
+        <machine canonical='pc-0.11'>pc</machine>
+        <machine>pc-0.10</machine>
+        <machine>isapc</machine>
+      </domain>
     </arch>
     <features>
       <acpi default='on' toggle='yes'/>
@@ -43,11 +80,46 @@
     </features>
   </guest>
 
+  <guest>
+    <os_type>hvm</os_type>
+    <arch name='arm'>
+      <wordsize>32</wordsize>
+      <emulator>/usr/bin/qemu-system-arm</emulator>
+      <machine>integratorcp</machine>
+      <machine>syborg</machine>
+      <machine>musicpal</machine>
+      <machine>mainstone</machine>
+      <machine>n800</machine>
+      <machine>n810</machine>
+      <machine>cheetah</machine>
+      <machine>sx1</machine>
+      <machine>sx1-v1</machine>
+      <machine>tosa</machine>
+      <machine>akita</machine>
+      <machine>spitz</machine>
+      <machine>borzoi</machine>
+      <machine>terrier</machine>
+      <machine>connex</machine>
+      <machine>verdex</machine>
+      <machine>lm3s811evb</machine>
+      <machine>lm3s6965evb</machine>
+      <machine>realview</machine>
+      <machine>versatilepb</machine>
+      <machine>versatileab</machine>
+      <domain type='qemu'>
+      </domain>
+    </arch>
+  </guest>
+
   <guest>
     <os_type>hvm</os_type>
     <arch name='mips'>
       <wordsize>32</wordsize>
       <emulator>/usr/bin/qemu-system-mips</emulator>
+      <machine>malta</machine>
+      <machine>mipssim</machine>
+      <machine>magnum</machine>
+      <machine>pica61</machine>
       <machine>mips</machine>
       <domain type='qemu'>
       </domain>
@@ -59,6 +131,10 @@
     <arch name='mipsel'>
       <wordsize>32</wordsize>
       <emulator>/usr/bin/qemu-system-mipsel</emulator>
+      <machine>malta</machine>
+      <machine>mipssim</machine>
+      <machine>magnum</machine>
+      <machine>pica61</machine>
       <machine>mips</machine>
       <domain type='qemu'>
       </domain>
@@ -70,7 +146,18 @@
     <arch name='sparc'>
       <wordsize>32</wordsize>
       <emulator>/usr/bin/qemu-system-sparc</emulator>
-      <machine>sun4m</machine>
+      <machine>SS-5</machine>
+      <machine>SS-10</machine>
+      <machine>SS-600MP</machine>
+      <machine>SS-20</machine>
+      <machine>Voyager</machine>
+      <machine>LX</machine>
+      <machine>SS-4</machine>
+      <machine>SPARCClassic</machine>
+      <machine>SPARCbook</machine>
+      <machine>SS-1000</machine>
+      <machine>SS-2000</machine>
+      <machine>SS-2</machine>
       <domain type='qemu'>
       </domain>
     </arch>
@@ -82,6 +169,10 @@
       <wordsize>32</wordsize>
       <emulator>/usr/bin/qemu-system-ppc</emulator>
       <machine>g3beige</machine>
+      <machine>mpc8544ds</machine>
+      <machine>bamboo</machine>
+      <machine>ref405ep</machine>
+      <machine>taihu</machine>
       <machine>mac99</machine>
       <machine>prep</machine>
       <domain type='qemu'>
@@ -106,4 +197,19 @@
     </features>
   </guest>
 
+  <guest>
+    <os_type>xen</os_type>
+    <arch name='x86_64'>
+      <wordsize>64</wordsize>
+      <emulator>/usr/bin/xenner</emulator>
+      <machine>xenner</machine>
+      <domain type='kvm'>
+      </domain>
+    </arch>
+    <features>
+      <acpi default='on' toggle='yes'/>
+      <apic default='on' toggle='no'/>
+    </features>
+  </guest>
+
 </capabilities>