diff --git a/tests/cputestdata/cpu-cpuid.py b/tests/cputestdata/cpu-cpuid.py
index 37d00e3c97..dac43debb6 100755
--- a/tests/cputestdata/cpu-cpuid.py
+++ b/tests/cputestdata/cpu-cpuid.py
@@ -158,8 +158,9 @@ def parseMap():
     cpuMap = {}
     for feature in data["cpus"]["feature"]:
         for fType in ["cpuid", "msr"]:
-            if fType in feature:
-                cpuMap[feature["@name"]] = parseMapFeature(fType, feature[fType])
+            if fType not in feature:
+                continue
+            cpuMap[feature["@name"]] = parseMapFeature(fType, feature[fType])
 
     return cpuMap