diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
index 7ef230ed85962f64b919cfaa471b765ddb40c893..6a6603bc9b20424d327b38cbf88129776c5ea6d1 100644
--- a/src/cpu/cpu_map.xml
+++ b/src/cpu/cpu_map.xml
@@ -347,7 +347,6 @@
     </model>
 
     <model name='cpu64-rhel6'>
-      <feature name='abm'/>
       <feature name='apic'/>
       <feature name='clflush'/>
       <feature name='cmov'/>
@@ -373,7 +372,6 @@
       <feature name='sse'/>
       <feature name='sse2'/>
       <feature name='pni'/>
-      <feature name='sse4a'/>
       <feature name='syscall'/>
       <feature name='tsc'/>
     </model>
diff --git a/tests/cputestdata/x86-baseline-no-vendor-result.xml b/tests/cputestdata/x86-baseline-no-vendor-result.xml
index 4b4921cf9308bf67e51570f4b54b6e05d05fae12..00e03b21526044d526acc41d976787b033a4c3b8 100644
--- a/tests/cputestdata/x86-baseline-no-vendor-result.xml
+++ b/tests/cputestdata/x86-baseline-no-vendor-result.xml
@@ -1,4 +1,3 @@
 <cpu mode='custom' match='exact'>
-  <model fallback='allow'>kvm64</model>
-  <feature policy='require' name='lahf_lm'/>
+  <model fallback='allow'>cpu64-rhel6</model>
 </cpu>