diff --git a/qemu/tests/cfg/qemu_cpu.cfg b/qemu/tests/cfg/qemu_cpu.cfg
index ce852346c9ccdba35a607e868021239268fdcafe..e451158601d74d20d041a92bdfdde19e409c3275 100644
--- a/qemu/tests/cfg/qemu_cpu.cfg
+++ b/qemu/tests/cfg/qemu_cpu.cfg
@@ -3,22 +3,33 @@
     type = cpuid
     start_vm = "no"
     smp = 1
-    # uncomment the following line if you don't have a RHEL-6 QEMU:
-    #no rhel64
+    # QEMU versions:
+    variants:
+        - unknown_qemu:
+        - rhel64:
+        - qemu13:
+
+    # uncomment the line corresponding to the QEMU version, if you know it:
+    only unknown_qemu
+    #only rhel64
+    #only qemu13
+
     variants:
         - check_models:
             test_type = "test_qemu_cpu_models_list"
+            # we don't know if all models will be available if QEMU
+            # version is unknown:
+            no unknown_qemu
             cpu_models = "qemu64 phenom core2duo kvm64 qemu32"
             cpu_models += " coreduo 486 pentium pentium2"
             cpu_models += " pentium3 athlon n270 Conroe Penryn"
             cpu_models += " Nehalem Westmere SandyBridge Haswell"
             cpu_models += " Opteron_G1 Opteron_G2 Opteron_G3"
             cpu_models += " Opteron_G4 Opteron_G5"
-            variants:
-                - rhel64:
-                    cpu_models += " cpu64-rhel6 cpu64-rhel5"
-                - qemu13:
-                    cpu_models += " kvm32"
+            rhel64:
+                cpu_models += " cpu64-rhel6 cpu64-rhel5"
+            qemu13:
+                cpu_models += " kvm32"
         - default.vendor:
             test_type = "default_vendor"
             variants:
@@ -31,6 +42,9 @@
                     # kvm by default overides vendor with host's value
                 - nokvm:
                     disable_kvm = "yes"
+                    # we don't know if all models will be available if QEMU
+                    # version is unknown:
+                    no unknown_qemu
                     variants:
                         - intel:
                             vendor = "GenuineIntel"
@@ -45,10 +59,8 @@
                             cpu_models += " Opteron_G1 Opteron_G2"
                             cpu_models += " Opteron_G3 Opteron_G4"
                             cpu_models += " Opteron_G5"
-                            variants:
-                                - qemu13:
-                                - rhel64:
-                                    cpu_models += " cpu64-rhel6 cpu64-rhel5"
+                            rhel64:
+                                cpu_models += " cpu64-rhel6 cpu64-rhel5"
         # CPUID data tests:
         - cpuid.custom:
             disable_kvm = yes