diff --git a/qemu/tests/cfg/qemu_cpu.cfg b/qemu/tests/cfg/qemu_cpu.cfg
index a6db65f1232f0ad2f89919512a5ce40d13ab45a0..a178c3459bb4b351cca577a2f1401871df8adf25 100644
--- a/qemu/tests/cfg/qemu_cpu.cfg
+++ b/qemu/tests/cfg/qemu_cpu.cfg
@@ -210,11 +210,19 @@
                     machine.rhel:
                         ignore_cpuid_leaves += " 0xc0000000,0x0"
 
-                    # RHEL-6.0 QEMU had broken feature aliases on
-                    # 0x80000001.EDX, so ignore it:
+                    #FIXED BUG: RHEL-6.0 QEMU had broken feature aliases on
+                    # 0x80000001.EDX and they were fixed without adding any
+                    # compat code, so ignore those bits:
                     machine.rhel.rhel600:
                         cpu.intel:
+                            # alias bits were removed on Intel CPU models
                             ignore_cpuid_leaves += " 0x80000001,0x00,edx"
+                        cpu.amd.Opteron_G1, cpu.amd.Opteron_G2, cpu.amd.Opteron_G3:
+                            # AMD alias bits that were corrected on RHEL-6.1:
+                            # mtrr, mca, pse36
+                            ignore_cpuid_leaves += " 0x80000001,0x0,edx,12"
+                            ignore_cpuid_leaves += " 0x80000001,0x0,edx,14"
+                            ignore_cpuid_leaves += " 0x80000001,0x0,edx,17"
 
                     # bz#819562: broken passthrough mode of CPUID leaf 7
                     machine.rhel.rhel620: