diff --git a/tests/cputest.c b/tests/cputest.c
index d58f15d1e7..801a4c04ff 100644
--- a/tests/cputest.c
+++ b/tests/cputest.c
@@ -859,6 +859,7 @@ mymain(void)
     DO_TEST_CPUID("x86", "Core-i7-4600U", true);
     DO_TEST_CPUID("x86", "Core-i7-5600U", true);
     DO_TEST_CPUID("x86", "Core2-E6850", true);
+    DO_TEST_CPUID("x86", "Core2-Q9500", false);
 
 #if WITH_QEMU && WITH_YAJL
     qemuTestDriverFree(&driver);
diff --git a/tests/cputestdata/x86-cpuid-Core2-Q9500-guest.xml b/tests/cputestdata/x86-cpuid-Core2-Q9500-guest.xml
new file mode 100644
index 0000000000..37feefa9c2
--- /dev/null
+++ b/tests/cputestdata/x86-cpuid-Core2-Q9500-guest.xml
@@ -0,0 +1,22 @@
+<cpu mode='custom' match='exact'>
+  <arch>x86_64</arch>
+  <model fallback='forbid'>Penryn</model>
+  <vendor>Intel</vendor>
+  <feature policy='require' name='vme'/>
+  <feature policy='require' name='ds'/>
+  <feature policy='require' name='acpi'/>
+  <feature policy='require' name='ss'/>
+  <feature policy='require' name='ht'/>
+  <feature policy='require' name='tm'/>
+  <feature policy='require' name='pbe'/>
+  <feature policy='require' name='dtes64'/>
+  <feature policy='require' name='monitor'/>
+  <feature policy='require' name='ds_cpl'/>
+  <feature policy='require' name='vmx'/>
+  <feature policy='require' name='est'/>
+  <feature policy='require' name='tm2'/>
+  <feature policy='require' name='xtpr'/>
+  <feature policy='require' name='pdcm'/>
+  <feature policy='require' name='xsave'/>
+  <feature policy='require' name='osxsave'/>
+</cpu>
diff --git a/tests/cputestdata/x86-cpuid-Core2-Q9500-host.xml b/tests/cputestdata/x86-cpuid-Core2-Q9500-host.xml
new file mode 100644
index 0000000000..4dc25588d5
--- /dev/null
+++ b/tests/cputestdata/x86-cpuid-Core2-Q9500-host.xml
@@ -0,0 +1,22 @@
+<cpu>
+  <arch>x86_64</arch>
+  <model>Penryn</model>
+  <vendor>Intel</vendor>
+  <feature name='vme'/>
+  <feature name='ds'/>
+  <feature name='acpi'/>
+  <feature name='ss'/>
+  <feature name='ht'/>
+  <feature name='tm'/>
+  <feature name='pbe'/>
+  <feature name='dtes64'/>
+  <feature name='monitor'/>
+  <feature name='ds_cpl'/>
+  <feature name='vmx'/>
+  <feature name='est'/>
+  <feature name='tm2'/>
+  <feature name='xtpr'/>
+  <feature name='pdcm'/>
+  <feature name='xsave'/>
+  <feature name='osxsave'/>
+</cpu>
diff --git a/tests/cputestdata/x86-cpuid-Core2-Q9500.xml b/tests/cputestdata/x86-cpuid-Core2-Q9500.xml
new file mode 100644
index 0000000000..985263b215
--- /dev/null
+++ b/tests/cputestdata/x86-cpuid-Core2-Q9500.xml
@@ -0,0 +1,30 @@
+<!-- Intel(R) Core(TM)2 Quad CPU    Q9500  @ 2.83GHz -->
+<cpudata arch='x86'>
+  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000d' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x0001067a' ebx='0x03040800' ecx='0x0c08e3bd' edx='0xbfebfbff'/>
+  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x05b0b101' ebx='0x005657f0' ecx='0x00000000' edx='0x2cb43048'/>
+  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x0c000121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000001'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x0c000122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000001'/>
+  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x0c004143' ebx='0x02c0003f' ecx='0x00000fff' edx='0x00000001'/>
+  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00022220'/>
+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000003' edx='0x00000000'/>
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000400' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07280202' ebx='0x00000000' ecx='0x00000000' edx='0x00000503'/>
+  <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x00000003' ebx='0x00000240' ecx='0x00000240' edx='0x00000000'/>
+  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000001' edx='0x20100800'/>
+  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x65746e49' ebx='0x2952286c' ecx='0x726f4320' edx='0x4d542865'/>
+  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x51203229' ebx='0x20646175' ecx='0x20555043' edx='0x51202020'/>
+  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x30303539' ebx='0x20402020' ecx='0x33382e32' edx='0x007a4847'/>
+  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0c006040' edx='0x00000000'/>
+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003024' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000003' ebx='0x00000240' ecx='0x00000240' edx='0x00000000'/>
+  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000003' ebx='0x00000240' ecx='0x00000240' edx='0x00000000'/>
+</cpudata>