diff --git a/tests/chamfer/data/complex/B9 b/tests/chamfer/data/complex/B9
index fc5400a731..3a3a1533aa 100644
--- a/tests/chamfer/data/complex/B9
+++ b/tests/chamfer/data/complex/B9
@@ -11,20 +11,30 @@ if { [string compare $command chamf_sequence] == 0 } {
   if {[array get env os_type] != ""} {
     set os $env(os_type)
   }
+  
   if { [string compare ${os} "Windows-64-VC9"] != 0 && [string compare ${os} "Windows-64-VC10"] != 0} {
     set nf 0
     if { [string compare $group equal_dist] == 0 } {
-      if {[string compare $os "Debian40"] == 0 || [string compare $os "Mandriva2008"] == 0 || [string compare $os "Mandriva2010"] == 0} {
+      if {[string compare $os "Debian40"] == 0 || [string compare $os "Mandriva2008"] == 0 || [string compare $os "Mandriva2010"] == 0 } {
         set nf 4
       }
     }
-    if { [string compare $group dist_dist] == 0 && [string compare $os "Mandriva2010"] == 0 } {
-      ##set nf 2
-      set nf 0
-    }
-    if { $nf != 0 } {
-      #puts "TODO OCC22909 $os:Faulty shapes in variables faulty_1 to faulty_$nf"
-      puts "TODO OCC22909 $os:Faulty shapes in variables faulty_1 to faulty_"
+    if { [string compare $group dist_dist] == 0 } {
+      if {[string compare $os "Mandriva2010"] == 0} {
+        set nf 2
+      ##set nf 0
+      }
     }
   }
+  
+  if { [string compare ${os} "windows"] == 0} {
+    if {[string compare $group dist_dist] == 0 || [string compare $group equal_dist] == 0 } {
+      set nf 2
+    }
+  }
+  
+  if { $nf != 0 } {
+     #puts "TODO OCC22909 $os:Faulty shapes in variables faulty_1 to faulty_$nf"
+     puts "TODO OCC22909 $os:Faulty shapes in variables faulty_1 to faulty_"
+  }
 }