diff --git a/tests/cputest.c b/tests/cputest.c
index c962f8dfb0..c21f86f7fe 100644
--- a/tests/cputest.c
+++ b/tests/cputest.c
@@ -848,6 +848,7 @@ mymain(void)
DO_TEST_CPUID("x86", "A10-5800K", true);
DO_TEST_CPUID("x86", "Atom-D510", false);
DO_TEST_CPUID("x86", "Atom-N450", false);
+ DO_TEST_CPUID("x86", "Core-i5-2500", true);
#if WITH_QEMU && WITH_YAJL
qemuTestDriverFree(&driver);
diff --git a/tests/cputestdata/x86-cpuid-Core-i5-2500-guest.xml b/tests/cputestdata/x86-cpuid-Core-i5-2500-guest.xml
new file mode 100644
index 0000000000..d12df2d609
--- /dev/null
+++ b/tests/cputestdata/x86-cpuid-Core-i5-2500-guest.xml
@@ -0,0 +1,24 @@
+
+ x86_64
+ SandyBridge
+ Intel
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/cputestdata/x86-cpuid-Core-i5-2500-host.xml b/tests/cputestdata/x86-cpuid-Core-i5-2500-host.xml
new file mode 100644
index 0000000000..5572ba5de6
--- /dev/null
+++ b/tests/cputestdata/x86-cpuid-Core-i5-2500-host.xml
@@ -0,0 +1,24 @@
+
+ x86_64
+ SandyBridge
+ Intel
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/cputestdata/x86-cpuid-Core-i5-2500-json.xml b/tests/cputestdata/x86-cpuid-Core-i5-2500-json.xml
new file mode 100644
index 0000000000..a2ecde6ba9
--- /dev/null
+++ b/tests/cputestdata/x86-cpuid-Core-i5-2500-json.xml
@@ -0,0 +1,9 @@
+
+ x86_64
+ SandyBridge
+
+
+
+
+
+
diff --git a/tests/cputestdata/x86-cpuid-Core-i5-2500.json b/tests/cputestdata/x86-cpuid-Core-i5-2500.json
new file mode 100644
index 0000000000..156b772482
--- /dev/null
+++ b/tests/cputestdata/x86-cpuid-Core-i5-2500.json
@@ -0,0 +1,88 @@
+{
+ "return": [
+ {
+ "cpuid-register": "EAX",
+ "cpuid-input-eax": 6,
+ "features": 4
+ },
+ {
+ "cpuid-register": "EAX",
+ "cpuid-input-ecx": 1,
+ "cpuid-input-eax": 13,
+ "features": 1
+ },
+ {
+ "cpuid-register": "EDX",
+ "cpuid-input-eax": 2147483658,
+ "features": 0
+ },
+ {
+ "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": 1
+ },
+ {
+ "cpuid-register": "EDX",
+ "cpuid-input-eax": 2147483649,
+ "features": 672139264
+ },
+ {
+ "cpuid-register": "ECX",
+ "cpuid-input-ecx": 0,
+ "cpuid-input-eax": 7,
+ "features": 0
+ },
+ {
+ "cpuid-register": "EBX",
+ "cpuid-input-ecx": 0,
+ "cpuid-input-eax": 7,
+ "features": 2
+ },
+ {
+ "cpuid-register": "ECX",
+ "cpuid-input-eax": 1,
+ "features": 2545558019
+ },
+ {
+ "cpuid-register": "EDX",
+ "cpuid-input-eax": 1,
+ "features": 260832255
+ }
+ ],
+ "id": "feature-words"
+}
+
+{
+ "return": 6,
+ "id": "family"
+}
+
+{
+ "return": 42,
+ "id": "model"
+}
+
+{
+ "return": 7,
+ "id": "stepping"
+}
+
+{
+ "return": " Intel(R) Core(TM) i5-2500 CPU @ 3.30GHz",
+ "id": "model-id"
+}
diff --git a/tests/cputestdata/x86-cpuid-Core-i5-2500.xml b/tests/cputestdata/x86-cpuid-Core-i5-2500.xml
new file mode 100644
index 0000000000..0a3341367f
--- /dev/null
+++ b/tests/cputestdata/x86-cpuid-Core-i5-2500.xml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+