diff --git a/tests/cpuid.def b/tests/cpuid.def
index 342f7d83a63..05fe8e94a82 100644
--- a/tests/cpuid.def
+++ b/tests/cpuid.def
@@ -1,38 +1,11 @@
-# Copyright (C) 2017-2025 Intel Corporation.
-# 
-# This software and the related documents are Intel copyrighted materials, and your
-# use of them is governed by the express license under which they were provided to
-# you ("License"). Unless the License provides otherwise, you may not use, modify,
-# copy, publish, distribute, disclose or transmit this software or the related
-# documents without Intel's prior written permission.
-# 
-# This software and the related documents are provided as is, with no express or
-# implied warranties, other than those that are expressly stated in the License.
-#
-# CPUID_VERSION = 1.0
 #      Input      =>               Output
 # EAX      ECX    =>   EAX      EBX      ECX      EDX
-00000000 ******** => 00000024 756e6547 6c65746e 49656e69
+00000000 ******** => 00000024 756e6547 6c65746e 49656e69 #Processor ID and Manufacturer
 00000001 ******** => 00400f10 00100800 7ffaf3ff bfebfbff
-00000002 ******** => 76035a01 00f0b6ff 00000000 00c10000
-00000003 ******** => 00000000 00000000 00000000 00000000
-00000004 00000000 => 7c004121 01c0003f 0000003f 00000000 #Deterministic Cache
-00000004 00000001 => 7c004122 01c0003f 0000003f 00000000
-00000004 00000002 => 7c004143 03c0003f 000003ff 00000000
-00000004 00000003 => 7c0fc163 0280003f 0000dfff 00000004
-00000004 00000004 => 00000000 00000000 00000000 00000000
-00000005 ******** => 00000040 00000040 00000003 00042120 #MONITOR/MWAIT
-00000006 ******** => 00000077 00000002 00000001 00000000 #Thermal and Power
-00000007 00000000 => 00000001 f3bfbfbf bac05ffe 03d54130 #Extended Features
+00000007 00000000 => 00000002 f3bfbfbf bac05ffe 03d54130 #Extended Features
 00000007 00000001 => 98ee00bf 00000002 00000020 1d29cd3e
-00000008 ******** => 00000000 00000000 00000000 00000000
-00000009 ******** => 00000000 00000000 00000000 00000000 #Direct Cache
-0000000a ******** => 07300403 00000000 00000000 00000603
-0000000b 00000000 => 00000001 00000002 00000100 00000000 #Extended Topology
-0000000b 00000001 => 00000004 00000002 00000201 00000000
-0000000c ******** => 00000000 00000000 00000000 00000000
 0000000d 00000000 => 000e02e7 00002b00 00002b00 00000000 #xcr0
-0000000d 00000001 => 0000001f 00000240 00000100 00000000
+0000000d 00000001 => 0000001f 00000240 00000100 00000000 #Supervisor State
 0000000d 00000002 => 00000100 00000240 00000000 00000000
 0000000d 00000005 => 00000040 00000440 00000000 00000000 #zmasks
 0000000d 00000006 => 00000200 00000480 00000000 00000000 #zmmh
@@ -40,7 +13,6 @@
 0000000d 00000011 => 00000040 00000ac0 00000002 00000000 #tileconfig
 0000000d 00000012 => 00002000 00000b00 00000006 00000000 #tiles
 0000000d 00000013 => 00000080 000003c0 00000000 00000000 #APX
-00000014 00000000 => 00000000 00000010 00000000 00000000 #ptwrite
 00000019 ******** => 00000000 00000005 00000000 00000000 #Key Locker
 0000001d 00000000 => 00000001 00000000 00000000 00000000 #AMX Tile
 0000001d 00000001 => 04002000 00080040 00000010 00000000 #AMX Palette1
@@ -48,15 +20,8 @@
 0000001e 00000001 => 000001ff 00000000 00000000 00000000
 00000024 00000000 => 00000001 00070002 00000000 00000000 #AVX10
 00000024 00000001 => 00000000 00000000 00000004 00000000
-80000000 ******** => 80000008 00000000 00000000 00000000
+80000000 ******** => 80000004 00000000 00000000 00000000
 80000001 ******** => 00000000 00000000 00000121 2c100000
 80000002 ******** => 00000000 00000000 00000000 00000000
 80000003 ******** => 00000000 00000000 00000000 00000000
 80000004 ******** => 00000000 00000000 00000000 00000000
-80000005 ******** => 00000000 00000000 00000000 00000000
-80000006 ******** => 00000000 00000000 01006040 00000000
-80000007 ******** => 00000000 00000000 00000000 00000100
-80000008 ******** => 00003028 00000200 00000200 00000000
-
-# This file was copied from intel-sde/misc/cpuid/future/cpuid.def, and modified to
-# add support for `AVX512_VP2INTERSECT`