diff --git a/tests/cputest.c b/tests/cputest.c
index aa3fde12bf..cecee537e7 100644
--- a/tests/cputest.c
+++ b/tests/cputest.c
@@ -869,6 +869,7 @@ mymain(void)
DO_TEST_CPUID("x86", "Phenom-B95", true);
DO_TEST_CPUID("x86", "Xeon-5110", false);
DO_TEST_CPUID("x86", "Xeon-E3-1245", true);
+ DO_TEST_CPUID("x86", "Xeon-E5-2630", true);
#if WITH_QEMU && WITH_YAJL
qemuTestDriverFree(&driver);
diff --git a/tests/cputestdata/x86-cpuid-Xeon-E5-2630-guest.xml b/tests/cputestdata/x86-cpuid-Xeon-E5-2630-guest.xml
new file mode 100644
index 0000000000..ce5aa79a75
--- /dev/null
+++ b/tests/cputestdata/x86-cpuid-Xeon-E5-2630-guest.xml
@@ -0,0 +1,29 @@
+
+ x86_64
+ Haswell-noTSX
+ Intel
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/cputestdata/x86-cpuid-Xeon-E5-2630-host.xml b/tests/cputestdata/x86-cpuid-Xeon-E5-2630-host.xml
new file mode 100644
index 0000000000..26a3b904a6
--- /dev/null
+++ b/tests/cputestdata/x86-cpuid-Xeon-E5-2630-host.xml
@@ -0,0 +1,29 @@
+
+ x86_64
+ Haswell-noTSX
+ Intel
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/cputestdata/x86-cpuid-Xeon-E5-2630-json.xml b/tests/cputestdata/x86-cpuid-Xeon-E5-2630-json.xml
new file mode 100644
index 0000000000..4cf361e960
--- /dev/null
+++ b/tests/cputestdata/x86-cpuid-Xeon-E5-2630-json.xml
@@ -0,0 +1,12 @@
+
+ x86_64
+ Haswell-noTSX
+
+
+
+
+
+
+
+
+
diff --git a/tests/cputestdata/x86-cpuid-Xeon-E5-2630.json b/tests/cputestdata/x86-cpuid-Xeon-E5-2630.json
new file mode 100644
index 0000000000..f1affa46ba
--- /dev/null
+++ b/tests/cputestdata/x86-cpuid-Xeon-E5-2630.json
@@ -0,0 +1,77 @@
+{
+ "return": [
+ {
+ "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": 33
+ },
+ {
+ "cpuid-register": "EDX",
+ "cpuid-input-eax": 2147483649,
+ "features": 739248128
+ },
+ {
+ "cpuid-register": "EBX",
+ "cpuid-input-ecx": 0,
+ "cpuid-input-eax": 7,
+ "features": 1963
+ },
+ {
+ "cpuid-register": "ECX",
+ "cpuid-input-eax": 1,
+ "features": 4160369155
+ },
+ {
+ "cpuid-register": "EDX",
+ "cpuid-input-eax": 1,
+ "features": 260832255
+ }
+ ],
+ "id": "feature-words"
+}
+
+{
+ "return": 6,
+ "id": "family"
+}
+
+{
+ "return": 63,
+ "id": "model"
+}
+
+{
+ "return": 2,
+ "id": "stepping"
+}
+
+{
+ "return": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
+ "id": "model-id"
+}
diff --git a/tests/cputestdata/x86-cpuid-Xeon-E5-2630.xml b/tests/cputestdata/x86-cpuid-Xeon-E5-2630.xml
new file mode 100644
index 0000000000..dc640acf57
--- /dev/null
+++ b/tests/cputestdata/x86-cpuid-Xeon-E5-2630.xml
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+