diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.xml
index 0d4efa14ff..6a6722d6e5 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.xml
@@ -10,8 +10,8 @@
   </os>
   <cpu mode='custom' match='exact'>
     <model fallback='forbid'>Haswell</model>
-    <feature policy='disable' name='rtm'/>
     <feature policy='disable' name='hle'/>
+    <feature policy='disable' name='rtm'/>
   </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.xml
index 1d1e81571c..ebf5830c88 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.xml
@@ -10,13 +10,13 @@
   </os>
   <cpu match='exact'>
     <model fallback='allow'>qemu64</model>
-    <feature policy='disable' name='svm'/>
-    <feature policy='disable' name='lm'/>
-    <feature policy='disable' name='nx'/>
-    <feature policy='disable' name='syscall'/>
-    <feature policy='disable' name='clflush'/>
-    <feature policy='disable' name='pse36'/>
     <feature policy='disable' name='mca'/>
+    <feature policy='disable' name='pse36'/>
+    <feature policy='disable' name='clflush'/>
+    <feature policy='disable' name='syscall'/>
+    <feature policy='disable' name='nx'/>
+    <feature policy='disable' name='lm'/>
+    <feature policy='disable' name='svm'/>
   </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.xml
index 6b9b7d4c64..f51f9edfbb 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.xml
@@ -10,18 +10,18 @@
   </os>
   <cpu match='exact'>
     <model fallback='forbid'>core2duo</model>
-    <feature name='lahf_lm' policy='require'/>
+    <feature name='ds' policy='require'/>
+    <feature name='ht' policy='require'/>
+    <feature name='tm' policy='optional'/>
+    <feature name='ds_cpl' policy='require'/>
     <feature name='xtpr' policy='require'/>
+    <feature name='3dnowext' policy='force'/>
+    <feature name='lahf_lm' policy='require'/>
+    <feature name='nx' policy='disable'/>
     <feature name='cx16' policy='disable'/>
     <feature name='tm2' policy='disable'/>
-    <feature name='ds_cpl' policy='require'/>
     <feature name='pbe' policy='disable'/>
-    <feature name='tm' policy='optional'/>
-    <feature name='ht' policy='require'/>
     <feature name='ss' policy='disable'/>
-    <feature name='ds' policy='require'/>
-    <feature name='nx' policy='disable'/>
-    <feature name='3dnowext' policy='force'/>
     <feature name='sse4a' policy='optional'/>
     <feature name='wdt' policy='forbid'/>
   </cpu>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.xml
index eaea564f60..7fa77c56b1 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.xml
@@ -10,18 +10,18 @@
   </os>
   <cpu match='exact'>
     <model>core2duo</model>
-    <feature name='lahf_lm' policy='require'/>
+    <feature name='ds' policy='require'/>
+    <feature name='ht' policy='require'/>
+    <feature name='tm' policy='optional'/>
+    <feature name='ds_cpl' policy='require'/>
     <feature name='xtpr' policy='require'/>
+    <feature name='3dnowext' policy='force'/>
+    <feature name='lahf_lm' policy='require'/>
+    <feature name='nx' policy='disable'/>
     <feature name='cx16' policy='disable'/>
     <feature name='tm2' policy='disable'/>
-    <feature name='ds_cpl' policy='require'/>
     <feature name='pbe' policy='disable'/>
-    <feature name='tm' policy='optional'/>
-    <feature name='ht' policy='require'/>
     <feature name='ss' policy='disable'/>
-    <feature name='ds' policy='require'/>
-    <feature name='nx' policy='disable'/>
-    <feature name='3dnowext' policy='force'/>
     <feature name='sse4a' policy='optional'/>
     <feature name='wdt' policy='forbid'/>
   </cpu>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.xml
index b8bbf25acb..fe6739c282 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.xml
@@ -10,10 +10,10 @@
   </os>
   <cpu match='minimum'>
     <model>qemu64</model>
-    <feature policy='disable' name='svm'/>
-    <feature policy='disable' name='lm'/>
-    <feature policy='disable' name='nx'/>
     <feature policy='disable' name='syscall'/>
+    <feature policy='disable' name='nx'/>
+    <feature policy='disable' name='lm'/>
+    <feature policy='disable' name='svm'/>
   </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.xml
index a9fc9c5291..84c77eac14 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.xml
@@ -10,21 +10,21 @@
   </os>
   <cpu match='strict'>
     <model>core2duo</model>
-    <feature name='lahf_lm' policy='require'/>
+    <feature name='ds' policy='require'/>
+    <feature name='acpi' policy='optional'/>
+    <feature name='ht' policy='require'/>
+    <feature name='tm' policy='optional'/>
+    <feature name='ds_cpl' policy='require'/>
+    <feature name='vmx' policy='optional'/>
+    <feature name='est' policy='optional'/>
     <feature name='xtpr' policy='require'/>
+    <feature name='3dnowext' policy='force'/>
+    <feature name='lahf_lm' policy='require'/>
+    <feature name='nx' policy='disable'/>
     <feature name='cx16' policy='disable'/>
     <feature name='tm2' policy='disable'/>
-    <feature name='est' policy='optional'/>
-    <feature name='vmx' policy='optional'/>
-    <feature name='ds_cpl' policy='require'/>
     <feature name='pbe' policy='disable'/>
-    <feature name='tm' policy='optional'/>
-    <feature name='ht' policy='require'/>
     <feature name='ss' policy='disable'/>
-    <feature name='acpi' policy='optional'/>
-    <feature name='ds' policy='require'/>
-    <feature name='nx' policy='disable'/>
-    <feature name='3dnowext' policy='force'/>
     <feature name='sse4a' policy='optional'/>
     <feature name='wdt' policy='forbid'/>
   </cpu>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml
index bfb189cd99..b00a8b743e 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml
@@ -19,19 +19,19 @@
     <model>core2duo</model>
     <vendor>Intel</vendor>
     <topology sockets='1' cores='2' threads='1'/>
-    <feature policy='require' name='lahf_lm'/>
-    <feature policy='require' name='xtpr'/>
-    <feature policy='require' name='cx16'/>
-    <feature policy='require' name='tm2'/>
-    <feature policy='require' name='est'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='ds_cpl'/>
-    <feature policy='require' name='pbe'/>
-    <feature policy='require' name='tm'/>
-    <feature policy='require' name='ht'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='acpi'/>
     <feature policy='require' name='ds'/>
+    <feature policy='require' name='acpi'/>
+    <feature policy='require' name='ss'/>
+    <feature policy='require' name='ht'/>
+    <feature policy='require' name='tm'/>
+    <feature policy='require' name='pbe'/>
+    <feature policy='require' name='ds_cpl'/>
+    <feature policy='require' name='vmx'/>
+    <feature policy='require' name='est'/>
+    <feature policy='require' name='tm2'/>
+    <feature policy='require' name='cx16'/>
+    <feature policy='require' name='xtpr'/>
+    <feature policy='require' name='lahf_lm'/>
   </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout.xml
index 912b542843..5f881f1fbb 100644
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout.xml
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout.xml
@@ -19,19 +19,19 @@
     <model fallback='allow'>core2duo</model>
     <vendor>Intel</vendor>
     <topology sockets='1' cores='2' threads='1'/>
-    <feature policy='require' name='lahf_lm'/>
-    <feature policy='require' name='xtpr'/>
-    <feature policy='require' name='cx16'/>
-    <feature policy='require' name='tm2'/>
-    <feature policy='require' name='est'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='ds_cpl'/>
-    <feature policy='require' name='pbe'/>
-    <feature policy='require' name='tm'/>
-    <feature policy='require' name='ht'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='acpi'/>
     <feature policy='require' name='ds'/>
+    <feature policy='require' name='acpi'/>
+    <feature policy='require' name='ss'/>
+    <feature policy='require' name='ht'/>
+    <feature policy='require' name='tm'/>
+    <feature policy='require' name='pbe'/>
+    <feature policy='require' name='ds_cpl'/>
+    <feature policy='require' name='vmx'/>
+    <feature policy='require' name='est'/>
+    <feature policy='require' name='tm2'/>
+    <feature policy='require' name='cx16'/>
+    <feature policy='require' name='xtpr'/>
+    <feature policy='require' name='lahf_lm'/>
   </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index f59746a4d9..8c2c8b4624 100644
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -19,19 +19,19 @@ virCPUDefPtr cpuHaswell;
 virCPUDefPtr cpuPower8;
 
 static virCPUFeatureDef cpuDefaultFeatures[] = {
-    { (char *) "lahf_lm",   -1 },
-    { (char *) "xtpr",      -1 },
-    { (char *) "cx16",      -1 },
-    { (char *) "tm2",       -1 },
-    { (char *) "est",       -1 },
-    { (char *) "vmx",       -1 },
-    { (char *) "ds_cpl",    -1 },
-    { (char *) "pbe",       -1 },
-    { (char *) "tm",        -1 },
-    { (char *) "ht",        -1 },
-    { (char *) "ss",        -1 },
+    { (char *) "ds",        -1 },
     { (char *) "acpi",      -1 },
-    { (char *) "ds",        -1 }
+    { (char *) "ss",        -1 },
+    { (char *) "ht",        -1 },
+    { (char *) "tm",        -1 },
+    { (char *) "pbe",       -1 },
+    { (char *) "ds_cpl",    -1 },
+    { (char *) "vmx",       -1 },
+    { (char *) "est",       -1 },
+    { (char *) "tm2",       -1 },
+    { (char *) "cx16",      -1 },
+    { (char *) "xtpr",      -1 },
+    { (char *) "lahf_lm",   -1 },
 };
 static virCPUDef cpuDefaultData = {
     VIR_CPU_TYPE_HOST,      /* type */
@@ -51,30 +51,30 @@ static virCPUDef cpuDefaultData = {
 };
 
 static virCPUFeatureDef cpuHaswellFeatures[] = {
-    { (char *) "lahf_lm",   -1 },
-    { (char *) "invtsc",    -1 },
-    { (char *) "abm",       -1 },
-    { (char *) "pdpe1gb",   -1 },
-    { (char *) "cmt",       -1 },
-    { (char *) "rdrand",    -1 },
-    { (char *) "f16c",      -1 },
-    { (char *) "osxsave",   -1 },
-    { (char *) "pdcm",      -1 },
-    { (char *) "xtpr",      -1 },
-    { (char *) "tm2",       -1 },
-    { (char *) "est",       -1 },
-    { (char *) "smx",       -1 },
-    { (char *) "vmx",       -1 },
-    { (char *) "ds_cpl",    -1 },
-    { (char *) "monitor",   -1 },
-    { (char *) "dtes64",    -1 },
-    { (char *) "pbe",       -1 },
-    { (char *) "tm",        -1 },
-    { (char *) "ht",        -1 },
-    { (char *) "ss",        -1 },
-    { (char *) "acpi",      -1 },
-    { (char *) "ds",        -1 },
     { (char *) "vme",       -1 },
+    { (char *) "ds",        -1 },
+    { (char *) "acpi",      -1 },
+    { (char *) "ss",        -1 },
+    { (char *) "ht",        -1 },
+    { (char *) "tm",        -1 },
+    { (char *) "pbe",       -1 },
+    { (char *) "dtes64",    -1 },
+    { (char *) "monitor",   -1 },
+    { (char *) "ds_cpl",    -1 },
+    { (char *) "vmx",       -1 },
+    { (char *) "smx",       -1 },
+    { (char *) "est",       -1 },
+    { (char *) "tm2",       -1 },
+    { (char *) "xtpr",      -1 },
+    { (char *) "pdcm",      -1 },
+    { (char *) "osxsave",   -1 },
+    { (char *) "f16c",      -1 },
+    { (char *) "rdrand",    -1 },
+    { (char *) "cmt",       -1 },
+    { (char *) "pdpe1gb",   -1 },
+    { (char *) "abm",       -1 },
+    { (char *) "invtsc",    -1 },
+    { (char *) "lahf_lm",   -1 },
 };
 static virCPUDef cpuHaswellData = {
     VIR_CPU_TYPE_HOST,      /* type */