diff --git a/tests/cputest.c b/tests/cputest.c
index 58e91b722a9a6b94b148b24625098732ca70b4d8..9798fc0076d3afef8880527216d45eb5494110e5 100644
--- a/tests/cputest.c
+++ b/tests/cputest.c
@@ -845,6 +845,8 @@ mymain(void)
DO_TEST_GUESTDATA("ppc64", "host", "guest-legacy-incompatible", ppc_models, NULL, -1);
DO_TEST_GUESTDATA("ppc64", "host", "guest-legacy-invalid", ppc_models, NULL, -1);
+ DO_TEST_CPUID("x86", "A10-5800K", true);
+
#if WITH_QEMU && WITH_YAJL
qemuTestDriverFree(&driver);
#endif
diff --git a/tests/cputestdata/x86-cpuid-A10-5800K-guest.xml b/tests/cputestdata/x86-cpuid-A10-5800K-guest.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ded7b308132ddba717a1197fe998046b0adf1c3f
--- /dev/null
+++ b/tests/cputestdata/x86-cpuid-A10-5800K-guest.xml
@@ -0,0 +1,26 @@
+
+ x86_64
+ Opteron_G5
+ AMD
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/cputestdata/x86-cpuid-A10-5800K-host.xml b/tests/cputestdata/x86-cpuid-A10-5800K-host.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4ee57d2ddccdf4baa9fdd15e720f732e5cc7e95d
--- /dev/null
+++ b/tests/cputestdata/x86-cpuid-A10-5800K-host.xml
@@ -0,0 +1,26 @@
+
+ x86_64
+ Opteron_G5
+ AMD
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/cputestdata/x86-cpuid-A10-5800K-json.xml b/tests/cputestdata/x86-cpuid-A10-5800K-json.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6ebef6046c9d80df2e9e8c8348f66c2f3c7e485c
--- /dev/null
+++ b/tests/cputestdata/x86-cpuid-A10-5800K-json.xml
@@ -0,0 +1,16 @@
+
+ x86_64
+ Opteron_G5
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/cputestdata/x86-cpuid-A10-5800K.json b/tests/cputestdata/x86-cpuid-A10-5800K.json
new file mode 100644
index 0000000000000000000000000000000000000000..53b39ad039535acf75556b94cf677d7fdb704880
--- /dev/null
+++ b/tests/cputestdata/x86-cpuid-A10-5800K.json
@@ -0,0 +1,77 @@
+{
+ "return": [
+ {
+ "cpuid-register": "EAX",
+ "cpuid-input-ecx": 1,
+ "cpuid-input-eax": 13,
+ "features": 0
+ },
+ {
+ "cpuid-register": "EDX",
+ "cpuid-input-eax": 2147483658,
+ "features": 9
+ },
+ {
+ "cpuid-register": "EAX",
+ "cpuid-input-eax": 1073741825,
+ "features": 16777467
+ },
+ {
+ "cpuid-register": "EDX",
+ "cpuid-input-eax": 3221225473,
+ "features": 0
+ },
+ {
+ "cpuid-register": "EDX",
+ "cpuid-input-eax": 2147483655,
+ "features": 0
+ },
+ {
+ "cpuid-register": "ECX",
+ "cpuid-input-eax": 2147483649,
+ "features": 2165747
+ },
+ {
+ "cpuid-register": "EDX",
+ "cpuid-input-eax": 2147483649,
+ "features": 642779136
+ },
+ {
+ "cpuid-register": "EBX",
+ "cpuid-input-ecx": 0,
+ "cpuid-input-eax": 7,
+ "features": 10
+ },
+ {
+ "cpuid-register": "ECX",
+ "cpuid-input-eax": 1,
+ "features": 3065524739
+ },
+ {
+ "cpuid-register": "EDX",
+ "cpuid-input-eax": 1,
+ "features": 126614527
+ }
+ ],
+ "id": "feature-words"
+}
+
+{
+ "return": 21,
+ "id": "family"
+}
+
+{
+ "return": 16,
+ "id": "model"
+}
+
+{
+ "return": 1,
+ "id": "stepping"
+}
+
+{
+ "return": "AMD A10-5800K APU with Radeon(tm) HD Graphics ",
+ "id": "model-id"
+}
diff --git a/tests/cputestdata/x86-cpuid-A10-5800K.xml b/tests/cputestdata/x86-cpuid-A10-5800K.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2889056ea52af47d698939c34402fda624158318
--- /dev/null
+++ b/tests/cputestdata/x86-cpuid-A10-5800K.xml
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+