diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
index 1bcceeda42..2724fa30a9 100644
--- a/src/conf/cpu_conf.c
+++ b/src/conf/cpu_conf.c
@@ -536,7 +536,7 @@ virCPUDefFormatBufFull(virBufferPtr buf,
 
     /* Format children */
     virBufferAdjustIndent(&childrenBuf, indent + 2);
-    if (def->arch)
+    if (def->type == VIR_CPU_TYPE_HOST && def->arch)
         virBufferAsprintf(&childrenBuf, "<arch>%s</arch>\n",
                           virArchToString(def->arch));
     if (virCPUDefFormatBuf(&childrenBuf, def, updateCPU) < 0)
diff --git a/tests/cputestdata/x86_64-cpuid-A10-5800K-guest.xml b/tests/cputestdata/x86_64-cpuid-A10-5800K-guest.xml
index dacf1d0ebc..98a95e1c41 100644
--- a/tests/cputestdata/x86_64-cpuid-A10-5800K-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-A10-5800K-guest.xml
@@ -1,5 +1,4 @@
 <cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
   <model fallback='forbid'>Opteron_G5</model>
   <vendor>AMD</vendor>
   <feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-A10-5800K-json.xml b/tests/cputestdata/x86_64-cpuid-A10-5800K-json.xml
index c021fcddf0..fa61b7b60b 100644
--- a/tests/cputestdata/x86_64-cpuid-A10-5800K-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-A10-5800K-json.xml
@@ -1,5 +1,4 @@
 <cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
   <model fallback='forbid'>Opteron_G5</model>
   <vendor>AMD</vendor>
   <feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Atom-D510-guest.xml b/tests/cputestdata/x86_64-cpuid-Atom-D510-guest.xml
index 5e9efc7c0b..caa0bfd53b 100644
--- a/tests/cputestdata/x86_64-cpuid-Atom-D510-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-D510-guest.xml
@@ -1,5 +1,4 @@
 <cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
   <model fallback='forbid'>core2duo</model>
   <vendor>Intel</vendor>
   <feature policy='require' name='ds'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Atom-N450-guest.xml b/tests/cputestdata/x86_64-cpuid-Atom-N450-guest.xml
index be11b887da..e8f5c93881 100644
--- a/tests/cputestdata/x86_64-cpuid-Atom-N450-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-N450-guest.xml
@@ -1,5 +1,4 @@
 <cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
   <model fallback='forbid'>core2duo</model>
   <vendor>Intel</vendor>
   <feature policy='require' name='ds'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2500-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-guest.xml
index 4c249eb0c9..22b5cf31fd 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-2500-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-guest.xml
@@ -1,5 +1,4 @@
 <cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
   <model fallback='forbid'>SandyBridge</model>
   <vendor>Intel</vendor>
   <feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2500-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-json.xml
index 2e2430e781..c9ae651922 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-2500-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-json.xml
@@ -1,5 +1,4 @@
 <cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
   <model fallback='forbid'>SandyBridge</model>
   <vendor>Intel</vendor>
   <feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-guest.xml
index 4c249eb0c9..22b5cf31fd 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-guest.xml
@@ -1,5 +1,4 @@
 <cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
   <model fallback='forbid'>SandyBridge</model>
   <vendor>Intel</vendor>
   <feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-json.xml
index 2e2430e781..c9ae651922 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-json.xml
@@ -1,5 +1,4 @@
 <cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
   <model fallback='forbid'>SandyBridge</model>
   <vendor>Intel</vendor>
   <feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-guest.xml
index 70d13282b3..0ccbcd0629 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-guest.xml
@@ -1,5 +1,4 @@
 <cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
   <model fallback='forbid'>Haswell-noTSX</model>
   <vendor>Intel</vendor>
   <feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-json.xml
index 8d3a0b6181..489de49fb0 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-json.xml
@@ -1,5 +1,4 @@
 <cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
   <model fallback='forbid'>Haswell-noTSX</model>
   <vendor>Intel</vendor>
   <feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-guest.xml
index 0ab5a7a7b1..c3561d5971 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-guest.xml
@@ -1,5 +1,4 @@
 <cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
   <model fallback='forbid'>Skylake-Client</model>
   <vendor>Intel</vendor>
   <feature policy='require' name='ds'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-json.xml
index e768aa674f..61a52212a6 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-json.xml
@@ -1,5 +1,4 @@
 <cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
   <model fallback='forbid'>Skylake-Client</model>
   <vendor>Intel</vendor>
   <feature policy='require' name='ss'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-guest.xml
index 4c249eb0c9..22b5cf31fd 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-guest.xml
@@ -1,5 +1,4 @@
 <cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
   <model fallback='forbid'>SandyBridge</model>
   <vendor>Intel</vendor>
   <feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-json.xml
index 4e721aba49..25c87e164e 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-json.xml
@@ -1,5 +1,4 @@
 <cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
   <model fallback='forbid'>SandyBridge</model>
   <vendor>Intel</vendor>
   <feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-guest.xml
index 776001ff4a..fa1a43a8a4 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-guest.xml
@@ -1,5 +1,4 @@
 <cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
   <model fallback='forbid'>IvyBridge</model>
   <vendor>Intel</vendor>
   <feature policy='require' name='ds'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-guest.xml
index 90957e99d2..d52f49d30a 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-guest.xml
@@ -1,5 +1,4 @@
 <cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
   <model fallback='forbid'>IvyBridge</model>
   <vendor>Intel</vendor>
   <feature policy='require' name='ds'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-json.xml
index 03c22de4b9..60086b8b14 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-json.xml
@@ -1,5 +1,4 @@
 <cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
   <model fallback='forbid'>IvyBridge</model>
   <vendor>Intel</vendor>
   <feature policy='require' name='ss'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3770-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-guest.xml
index 776001ff4a..fa1a43a8a4 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3770-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-guest.xml
@@ -1,5 +1,4 @@
 <cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
   <model fallback='forbid'>IvyBridge</model>
   <vendor>Intel</vendor>
   <feature policy='require' name='ds'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3770-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-json.xml
index c1544afd37..1dc866dba1 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3770-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-json.xml
@@ -1,5 +1,4 @@
 <cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
   <model fallback='forbid'>IvyBridge</model>
   <vendor>Intel</vendor>
   <feature policy='require' name='ss'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-guest.xml
index b2aac64b28..42e7c90112 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-guest.xml
@@ -1,5 +1,4 @@
 <cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
   <model fallback='forbid'>Haswell-noTSX</model>
   <vendor>Intel</vendor>
   <feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-json.xml
index 8e4e9d96a4..3ca3b0f243 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-json.xml
@@ -1,5 +1,4 @@
 <cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
   <model fallback='forbid'>Haswell-noTSX</model>
   <vendor>Intel</vendor>
   <feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-guest.xml
index cd7b4bb8e2..877895cf15 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-guest.xml
@@ -1,5 +1,4 @@
 <cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
   <model fallback='forbid'>Broadwell</model>
   <vendor>Intel</vendor>
   <feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-json.xml
index be11fa0616..a736cdfb04 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-json.xml
@@ -1,5 +1,4 @@
 <cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
   <model fallback='forbid'>Broadwell</model>
   <vendor>Intel</vendor>
   <feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core2-E6850-guest.xml b/tests/cputestdata/x86_64-cpuid-Core2-E6850-guest.xml
index dfcbe24dad..2392de6ce4 100644
--- a/tests/cputestdata/x86_64-cpuid-Core2-E6850-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core2-E6850-guest.xml
@@ -1,5 +1,4 @@
 <cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
   <model fallback='forbid'>Conroe</model>
   <vendor>Intel</vendor>
   <feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core2-E6850-json.xml b/tests/cputestdata/x86_64-cpuid-Core2-E6850-json.xml
index 8950119a11..e4117c293f 100644
--- a/tests/cputestdata/x86_64-cpuid-Core2-E6850-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core2-E6850-json.xml
@@ -1,5 +1,4 @@
 <cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
   <model fallback='forbid'>Conroe</model>
   <vendor>Intel</vendor>
   <feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core2-Q9500-guest.xml b/tests/cputestdata/x86_64-cpuid-Core2-Q9500-guest.xml
index 37feefa9c2..aa151bc545 100644
--- a/tests/cputestdata/x86_64-cpuid-Core2-Q9500-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core2-Q9500-guest.xml
@@ -1,5 +1,4 @@
 <cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
   <model fallback='forbid'>Penryn</model>
   <vendor>Intel</vendor>
   <feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-FX-8150-guest.xml b/tests/cputestdata/x86_64-cpuid-FX-8150-guest.xml
index 9858ee4e25..6bd032bbcb 100644
--- a/tests/cputestdata/x86_64-cpuid-FX-8150-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-FX-8150-guest.xml
@@ -1,5 +1,4 @@
 <cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
   <model fallback='forbid'>Opteron_G4</model>
   <vendor>AMD</vendor>
   <feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-1352-guest.xml b/tests/cputestdata/x86_64-cpuid-Opteron-1352-guest.xml
index 828a142711..652f1e4333 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-1352-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-1352-guest.xml
@@ -1,5 +1,4 @@
 <cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
   <model fallback='forbid'>Opteron_G3</model>
   <vendor>AMD</vendor>
   <feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-2350-guest.xml b/tests/cputestdata/x86_64-cpuid-Opteron-2350-guest.xml
index 828a142711..652f1e4333 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-2350-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-2350-guest.xml
@@ -1,5 +1,4 @@
 <cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
   <model fallback='forbid'>Opteron_G3</model>
   <vendor>AMD</vendor>
   <feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-2350-json.xml b/tests/cputestdata/x86_64-cpuid-Opteron-2350-json.xml
index 302d6562c8..741757aeb2 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-2350-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-2350-json.xml
@@ -1,5 +1,4 @@
 <cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
   <model fallback='forbid'>Opteron_G3</model>
   <vendor>AMD</vendor>
   <feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6234-guest.xml b/tests/cputestdata/x86_64-cpuid-Opteron-6234-guest.xml
index 9858ee4e25..6bd032bbcb 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-6234-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-6234-guest.xml
@@ -1,5 +1,4 @@
 <cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
   <model fallback='forbid'>Opteron_G4</model>
   <vendor>AMD</vendor>
   <feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6234-json.xml b/tests/cputestdata/x86_64-cpuid-Opteron-6234-json.xml
index cc89186611..2ad3c98a5a 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-6234-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-6234-json.xml
@@ -1,5 +1,4 @@
 <cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
   <model fallback='forbid'>Opteron_G4</model>
   <vendor>AMD</vendor>
   <feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6282-guest.xml b/tests/cputestdata/x86_64-cpuid-Opteron-6282-guest.xml
index 9858ee4e25..6bd032bbcb 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-6282-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-6282-guest.xml
@@ -1,5 +1,4 @@
 <cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
   <model fallback='forbid'>Opteron_G4</model>
   <vendor>AMD</vendor>
   <feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Pentium-P6100-guest.xml b/tests/cputestdata/x86_64-cpuid-Pentium-P6100-guest.xml
index f893f9f232..db5e0ae6af 100644
--- a/tests/cputestdata/x86_64-cpuid-Pentium-P6100-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Pentium-P6100-guest.xml
@@ -1,5 +1,4 @@
 <cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
   <model fallback='forbid'>core2duo</model>
   <vendor>Intel</vendor>
   <feature policy='require' name='ds'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Phenom-B95-guest.xml b/tests/cputestdata/x86_64-cpuid-Phenom-B95-guest.xml
index 60ba9c1ebd..d7a06108bc 100644
--- a/tests/cputestdata/x86_64-cpuid-Phenom-B95-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Phenom-B95-guest.xml
@@ -1,5 +1,4 @@
 <cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
   <model fallback='forbid'>Opteron_G3</model>
   <vendor>AMD</vendor>
   <feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Phenom-B95-json.xml b/tests/cputestdata/x86_64-cpuid-Phenom-B95-json.xml
index d4605263b8..7ce56ac8e7 100644
--- a/tests/cputestdata/x86_64-cpuid-Phenom-B95-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Phenom-B95-json.xml
@@ -1,5 +1,4 @@
 <cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
   <model fallback='forbid'>Opteron_G3</model>
   <vendor>AMD</vendor>
   <feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-5110-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-5110-guest.xml
index 28d112b341..d1b442d33f 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-5110-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-5110-guest.xml
@@ -1,5 +1,4 @@
 <cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
   <model fallback='forbid'>Conroe</model>
   <vendor>Intel</vendor>
   <feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-guest.xml
index 0ab5a7a7b1..c3561d5971 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-guest.xml
@@ -1,5 +1,4 @@
 <cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
   <model fallback='forbid'>Skylake-Client</model>
   <vendor>Intel</vendor>
   <feature policy='require' name='ds'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-json.xml
index e0e060691d..7af75509e6 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-json.xml
@@ -1,5 +1,4 @@
 <cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
   <model fallback='forbid'>Skylake-Client</model>
   <vendor>Intel</vendor>
   <feature policy='require' name='ss'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-guest.xml
index b02d963c15..980af07890 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-guest.xml
@@ -1,5 +1,4 @@
 <cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
   <model fallback='forbid'>Haswell-noTSX</model>
   <vendor>Intel</vendor>
   <feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-json.xml
index ec5f56205c..78b8be1118 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-json.xml
@@ -1,5 +1,4 @@
 <cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
   <model fallback='forbid'>Haswell-noTSX</model>
   <vendor>Intel</vendor>
   <feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-guest.xml
index b02d963c15..980af07890 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-guest.xml
@@ -1,5 +1,4 @@
 <cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
   <model fallback='forbid'>Haswell-noTSX</model>
   <vendor>Intel</vendor>
   <feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-json.xml
index 6e4aff07ad..2227ed0031 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-json.xml
@@ -1,5 +1,4 @@
 <cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
   <model fallback='forbid'>Haswell-noTSX</model>
   <vendor>Intel</vendor>
   <feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-guest.xml
index 81bf8c8c27..dbf8580a0e 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-guest.xml
@@ -1,5 +1,4 @@
 <cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
   <model fallback='forbid'>SandyBridge</model>
   <vendor>Intel</vendor>
   <feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-json.xml
index cb69ff56f3..d94a330f37 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-json.xml
@@ -1,5 +1,4 @@
 <cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
   <model fallback='forbid'>SandyBridge</model>
   <vendor>Intel</vendor>
   <feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-guest.xml
index c62e36a3a8..16d333aa26 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-guest.xml
@@ -1,5 +1,4 @@
 <cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
   <model fallback='forbid'>Haswell</model>
   <vendor>Intel</vendor>
   <feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-W3520-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-guest.xml
index 4037fa60cf..9c975c6792 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-W3520-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-guest.xml
@@ -1,5 +1,4 @@
 <cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
   <model fallback='forbid'>Nehalem</model>
   <vendor>Intel</vendor>
   <feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-W3520-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-json.xml
index 348bef8293..038c98e1d1 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-W3520-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-json.xml
@@ -1,5 +1,4 @@
 <cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
   <model fallback='forbid'>Nehalem</model>
   <vendor>Intel</vendor>
   <feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-X5460-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-X5460-guest.xml
index 9e21934b4d..a97efc5657 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-X5460-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-X5460-guest.xml
@@ -1,5 +1,4 @@
 <cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
   <model fallback='forbid'>Penryn</model>
   <vendor>Intel</vendor>
   <feature policy='require' name='vme'/>