diff --git a/tests/boolean/bopcommon_complex/D8 b/tests/boolean/bopcommon_complex/D8
index 8c8c3e13e1..22e0137a5a 100644
--- a/tests/boolean/bopcommon_complex/D8
+++ b/tests/boolean/bopcommon_complex/D8
@@ -1,6 +1,6 @@
 puts "TODO ?#22911 ALL: Error : The area of the resulting shape is"
-puts "TODO DEBUG_OCC24121 Debian60-64: Process killed by CPU limit"
-puts "TODO DEBUG_OCC24121 Debian60-64: TEST INCOMPLETE"
+puts "TODO ?DEBUG_OCC24121 Debian60-64: Process killed by CPU limit"
+puts "TODO ?DEBUG_OCC24121 Debian60-64: TEST INCOMPLETE"
 
 cpulimit 1500
 
diff --git a/tests/boolean/bopcommon_complex/D9 b/tests/boolean/bopcommon_complex/D9
index 0a8f931ffb..adde1b2ce4 100644
--- a/tests/boolean/bopcommon_complex/D9
+++ b/tests/boolean/bopcommon_complex/D9
@@ -1,6 +1,6 @@
 puts "TODO ?#22911 ALL: Error : The area of the resulting shape is"
-puts "TODO DEBUG_OCC24121 Debian60-64: Process killed by CPU limit"
-puts "TODO DEBUG_OCC24121 Debian60-64: TEST INCOMPLETE"
+puts "TODO ?DEBUG_OCC24121 Debian60-64: Process killed by CPU limit"
+puts "TODO ?DEBUG_OCC24121 Debian60-64: TEST INCOMPLETE"
 
 cpulimit 1500
 
diff --git a/tests/boolean/bopcut_complex/E1 b/tests/boolean/bopcut_complex/E1
index 025192882c..8a19f7159f 100644
--- a/tests/boolean/bopcut_complex/E1
+++ b/tests/boolean/bopcut_complex/E1
@@ -1,6 +1,6 @@
 puts "TODO ?#22911 ALL: Error : The bopcut cannot be built."
-puts "TODO DEBUG_OCC24121 Debian60-64: Process killed by CPU limit"
-puts "TODO DEBUG_OCC24121 Debian60-64: TEST INCOMPLETE"
+puts "TODO ?DEBUG_OCC24121 Debian60-64: Process killed by CPU limit"
+puts "TODO ?DEBUG_OCC24121 Debian60-64: TEST INCOMPLETE"
 
 cpulimit 1500
 
diff --git a/tests/boolean/bopcut_complex/E2 b/tests/boolean/bopcut_complex/E2
index 5d56729655..39e428d51f 100644
--- a/tests/boolean/bopcut_complex/E2
+++ b/tests/boolean/bopcut_complex/E2
@@ -1,6 +1,6 @@
 puts "TODO ?#22911 ALL: Error : The bopcut is not valid"
-puts "TODO DEBUG_OCC24121 Debian60-64: Process killed by CPU limit"
-puts "TODO DEBUG_OCC24121 Debian60-64: TEST INCOMPLETE"
+puts "TODO ?DEBUG_OCC24121 Debian60-64: Process killed by CPU limit"
+puts "TODO ?DEBUG_OCC24121 Debian60-64: TEST INCOMPLETE"
 
 cpulimit 1500
 
diff --git a/tests/offset/wire_unclosed_outside_0_005/A8 b/tests/offset/wire_unclosed_outside_0_005/A8
index 37443c823b..a771888ca1 100644
--- a/tests/offset/wire_unclosed_outside_0_005/A8
+++ b/tests/offset/wire_unclosed_outside_0_005/A8
@@ -1,7 +1,3 @@
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: \\*\\* Exception \\*\\*.*"
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: An exception was caught"
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: TEST INCOMPLETE"
-
 restore [locate_data_file offset_wire_026.brep] s
 
 set length 21112.9
diff --git a/tests/offset/wire_unclosed_outside_0_025/A8 b/tests/offset/wire_unclosed_outside_0_025/A8
index 8e7f042fad..cef8cefa13 100644
--- a/tests/offset/wire_unclosed_outside_0_025/A8
+++ b/tests/offset/wire_unclosed_outside_0_025/A8
@@ -1,7 +1,3 @@
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: \\*\\* Exception \\*\\*.*"
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: An exception was caught"
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: TEST INCOMPLETE"
-
 restore [locate_data_file offset_wire_026.brep] s
 
 set length 22417.7
diff --git a/tests/offset/wire_unclosed_outside_0_075/A8 b/tests/offset/wire_unclosed_outside_0_075/A8
index 085faa199b..0fca866670 100755
--- a/tests/offset/wire_unclosed_outside_0_075/A8
+++ b/tests/offset/wire_unclosed_outside_0_075/A8
@@ -1,8 +1,5 @@
 puts "TODO OCC23068 ALL: Error : big tolerance of shape result"
 puts "TODO ?OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_"
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: \\*\\* Exception \\*\\*.*"
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: An exception was caught"
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: TEST INCOMPLETE"
 
 restore [locate_data_file offset_wire_026.brep] s