diff --git a/tests/boolean/end b/tests/boolean/end
index 56258e3a9d..bece47dada 100755
--- a/tests/boolean/end
+++ b/tests/boolean/end
@@ -1,6 +1,7 @@
 if { [isdraw result] } {
    #check if result is valid
    
+   EnsureTolRule result result
    puts "checkshape"
    set ch [checkshape result]
    puts $ch
diff --git a/tests/bugs/heal/bug329 b/tests/bugs/heal/bug329
index 4e2baea625..f38d493aa1 100755
--- a/tests/bugs/heal/bug329
+++ b/tests/bugs/heal/bug329
@@ -9,6 +9,7 @@ puts ""
 ###########################################################
 
 restore [locate_data_file OCC329.brep] a 
+EnsureTolRule a a
 
 checkshape a
 set tol1 [maxtolerance a]
diff --git a/tests/bugs/modalg_1/buc60462_1 b/tests/bugs/modalg_1/buc60462_1
index bb20c30538..5d80ff01ee 100755
--- a/tests/bugs/modalg_1/buc60462_1
+++ b/tests/bugs/modalg_1/buc60462_1
@@ -10,6 +10,7 @@ puts ""
 restore [locate_data_file buc60462a.brep] a 
 checkshape a
 restore [locate_data_file buc60462b.brep] b
+EnsureTolRule b b
 checkshape b
 bsection result a b
 
diff --git a/tests/bugs/modalg_1/buc60463 b/tests/bugs/modalg_1/buc60463
index 3980770778..8d10a5867b 100755
--- a/tests/bugs/modalg_1/buc60463
+++ b/tests/bugs/modalg_1/buc60463
@@ -10,6 +10,7 @@ cpulimit 1400
 restore [locate_data_file buc60463a.brep] a 
 checkshape a
 restore [locate_data_file buc60463b.brep] b
+EnsureTolRule b b
 checkshape b
 bsection result a b
 
diff --git a/tests/bugs/modalg_2/bug292 b/tests/bugs/modalg_2/bug292
index e9b2f8a58b..8cb1a58c19 100755
--- a/tests/bugs/modalg_2/bug292
+++ b/tests/bugs/modalg_2/bug292
@@ -9,6 +9,7 @@ puts ""
 #################################################################
 
 restore [locate_data_file OCC292.brep] result
+EnsureTolRule result result
 checkshape result
 
 tclean result
diff --git a/tests/bugs/modalg_2/bug317 b/tests/bugs/modalg_2/bug317
index 964366bb2c..54d8edcd2d 100755
--- a/tests/bugs/modalg_2/bug317
+++ b/tests/bugs/modalg_2/bug317
@@ -7,6 +7,7 @@ puts ""
 ##################################################
 
 restore [locate_data_file OCC317.brep] result
+EnsureTolRule result result
 
 set che [checkshape result]
 if { [regexp {Faulty} $che] == 1} {
diff --git a/tests/bugs/modalg_2/bug330 b/tests/bugs/modalg_2/bug330
index bdf17c6aff..8178f9b4ac 100755
--- a/tests/bugs/modalg_2/bug330
+++ b/tests/bugs/modalg_2/bug330
@@ -10,6 +10,7 @@ puts ""
 ##################################################
 
 restore [locate_data_file OCC330.brep] result
+EnsureTolRule result result
 
 decho off
 set che [checkshape result]
diff --git a/tests/bugs/modalg_2/bug452_2 b/tests/bugs/modalg_2/bug452_2
index a938728c05..253de5f454 100755
--- a/tests/bugs/modalg_2/bug452_2
+++ b/tests/bugs/modalg_2/bug452_2
@@ -7,6 +7,7 @@ puts "========"
 puts ""
 
 restore [locate_data_file mds-part1.rle] a 
+EnsureTolRule a a
 set che [checkshape a]
 if { [regexp {Faulty} $che ] == 1 } {
     puts "Faulty OCC452 (shape 1): Source shape is invalid. It was detected by Checkshape command"
@@ -23,6 +24,7 @@ if { [regexp {Faulty} $che ] == 1 } {
 }
 
 restore [locate_data_file CTO900_ger60239a.rle] c
+EnsureTolRule c c
 set che [checkshape c]
 if { [regexp {Faulty} $che ] == 1 } {
     puts "Faulty OCC452 (shape 3): Source shape is invalid. It was detected by Checkshape command"
@@ -31,6 +33,7 @@ if { [regexp {Faulty} $che ] == 1 } {
 }
 
 restore [locate_data_file CTO900_ger60239b.rle] d
+EnsureTolRule d d
 set che [checkshape d]
 if { [regexp {Faulty} $che ] == 1 } {
     puts "Faulty OCC452 (shape 4): Source shape is invalid. It was detected by Checkshape command"
diff --git a/tests/bugs/modalg_2/bug452_3 b/tests/bugs/modalg_2/bug452_3
index 3ec86b68f2..d2a7ee3ba2 100755
--- a/tests/bugs/modalg_2/bug452_3
+++ b/tests/bugs/modalg_2/bug452_3
@@ -7,6 +7,7 @@ puts "========"
 puts ""
 
 restore [locate_data_file CTO900_ger60239a.rle] a 
+EnsureTolRule a a
 set che [checkshape a]
 if { [regexp {Faulty} $che ] == 1 } {
     puts "Faulty OCC452 (shape 5): Source shape is invalid. It was detected by Checkshape command"
@@ -15,6 +16,7 @@ if { [regexp {Faulty} $che ] == 1 } {
 }
 
 restore [locate_data_file CTO900_ger60239b.rle] b
+EnsureTolRule b b
 set che [checkshape b]
 if { [regexp {Faulty} $che ] == 1 } {
     puts "Faulty OCC452 (shape 6): Source shape is invalid. It was detected by Checkshape command"
diff --git a/tests/bugs/modalg_3/bug698 b/tests/bugs/modalg_3/bug698
index cd9a6275dc..0018f13e2c 100755
--- a/tests/bugs/modalg_3/bug698
+++ b/tests/bugs/modalg_3/bug698
@@ -7,6 +7,7 @@ cpulimit 10000
 restore [locate_data_file OCC698_1.brep] b4 
 checkshape b4
 restore [locate_data_file OCC698_2.brep] b5 
+EnsureTolRule b5 b5
 checkshape b5
 
 bcut result b5 b4
diff --git a/tests/bugs/modalg_4/bug697_1 b/tests/bugs/modalg_4/bug697_1
index e499447515..a699ceb640 100755
--- a/tests/bugs/modalg_4/bug697_1
+++ b/tests/bugs/modalg_4/bug697_1
@@ -10,6 +10,7 @@ puts ""
 ######################################################
 
 restore [locate_data_file OCC697_1.brep] b1 
+EnsureTolRule b1 b1
 restore [locate_data_file OCC697_2.brep] b2 
 
 checkshape b1
diff --git a/tests/bugs/modalg_4/bug774_1 b/tests/bugs/modalg_4/bug774_1
index b8a4a1a21e..1ae0ba6063 100755
--- a/tests/bugs/modalg_4/bug774_1
+++ b/tests/bugs/modalg_4/bug774_1
@@ -10,6 +10,7 @@ puts ""
 #################################
 
 restore [locate_data_file OCC774.brep] a 
+EnsureTolRule a a
 explode a
 checkshape a_1
 checkshape a_2
diff --git a/tests/bugs/modalg_4/bug776_1 b/tests/bugs/modalg_4/bug776_1
index 2478e60984..3e74ce2377 100755
--- a/tests/bugs/modalg_4/bug776_1
+++ b/tests/bugs/modalg_4/bug776_1
@@ -10,6 +10,7 @@ puts ""
 ##########################################
 
 restore [locate_data_file OCC776.brep] a 
+EnsureTolRule a a
 explode a
 checkshape a_1
 checkshape a_2
diff --git a/tests/bugs/modalg_4/bug776_2 b/tests/bugs/modalg_4/bug776_2
index cc8962d7a0..0007ceda11 100755
--- a/tests/bugs/modalg_4/bug776_2
+++ b/tests/bugs/modalg_4/bug776_2
@@ -10,6 +10,7 @@ puts ""
 ##########################################
 
 restore [locate_data_file OCC776.brep] a 
+EnsureTolRule a a
 explode a
 checkshape a_1
 checkshape a_2
diff --git a/tests/bugs/modalg_4/bug80 b/tests/bugs/modalg_4/bug80
index 84e95b82d3..db2d201038 100755
--- a/tests/bugs/modalg_4/bug80
+++ b/tests/bugs/modalg_4/bug80
@@ -8,6 +8,7 @@ puts ""
 ##########################################################
 
 restore [locate_data_file BUC60877_lh.brep] sh 
+EnsureTolRule sh sh
 checkshape sh
 
 plane pl 820 198 140 -1e-06 0 1
diff --git a/tests/bugs/modalg_4/bug919 b/tests/bugs/modalg_4/bug919
index dcca9030fd..46590969bf 100755
--- a/tests/bugs/modalg_4/bug919
+++ b/tests/bugs/modalg_4/bug919
@@ -14,6 +14,7 @@ explode a
 
 # See comment in CR23244:
 restore [locate_data_file OCC919-PROC.brep] a_1 
+EnsureTolRule a_1 a_1
 #
 
 checkshape a_1
diff --git a/tests/bugs/moddata_1/buc60652_2 b/tests/bugs/moddata_1/buc60652_2
index fb8e4e54de..e475d4a091 100755
--- a/tests/bugs/moddata_1/buc60652_2
+++ b/tests/bugs/moddata_1/buc60652_2
@@ -7,6 +7,7 @@ puts "=========="
 pload QAcommands
 
 restore [locate_data_file buc60652b.brep] result
+EnsureTolRule result result
 checkshape result
 BUC60652 result
 
diff --git a/tests/bugs/moddata_1/buc60652_3 b/tests/bugs/moddata_1/buc60652_3
index bde1f9333c..ffb71a2504 100755
--- a/tests/bugs/moddata_1/buc60652_3
+++ b/tests/bugs/moddata_1/buc60652_3
@@ -7,6 +7,7 @@ puts "==========="
 pload QAcommands
 
 restore [locate_data_file buc60652c.brep] result 
+EnsureTolRule result result
 checkshape result
 BUC60652 result
 
diff --git a/tests/bugs/moddata_1/buc60707 b/tests/bugs/moddata_1/buc60707
index dfe66d1b45..f574aa6385 100755
--- a/tests/bugs/moddata_1/buc60707
+++ b/tests/bugs/moddata_1/buc60707
@@ -7,6 +7,7 @@ puts ""
 ## Fillets created in CasCade version 3 do not display as shaded surfaces. 
 #################################################
 restore [locate_data_file buc60707a.brep] result
+EnsureTolRule result result
 checkshape result
 
 tclean result
diff --git a/tests/bugs/moddata_2/bug368 b/tests/bugs/moddata_2/bug368
index a3c733f480..f0cabf6428 100755
--- a/tests/bugs/moddata_2/bug368
+++ b/tests/bugs/moddata_2/bug368
@@ -9,6 +9,7 @@ puts ""
 ##############################################
 
 restore [locate_data_file OCC368.brep] result
+EnsureTolRule result result
 checkshape result
 
 tclean result
diff --git a/tests/bugs/moddata_2/fra62476_2 b/tests/bugs/moddata_2/fra62476_2
index 242acd6312..ff3d47a537 100755
--- a/tests/bugs/moddata_2/fra62476_2
+++ b/tests/bugs/moddata_2/fra62476_2
@@ -8,6 +8,7 @@ puts "=================================="
 puts ""
 
 restore [locate_data_file fra62476b.brep] result 
+EnsureTolRule result result
 checkshape result
 
 tclean result
diff --git a/tests/bugs/moddata_2/ger61235 b/tests/bugs/moddata_2/ger61235
index c61d04087d..24e6cef0ab 100755
--- a/tests/bugs/moddata_2/ger61235
+++ b/tests/bugs/moddata_2/ger61235
@@ -5,6 +5,7 @@ puts "==========="
 restore [locate_data_file ger61235a.brep] tool 
 checkshape tool
 restore [locate_data_file ger61235b.brep] object 
+EnsureTolRule object object
 checkshape object
 
 bsection result object tool 
diff --git a/tests/bugs/moddata_2/pro20333 b/tests/bugs/moddata_2/pro20333
index 0f67ccf038..5592fd068e 100755
--- a/tests/bugs/moddata_2/pro20333
+++ b/tests/bugs/moddata_2/pro20333
@@ -8,6 +8,7 @@ puts "It takes visual check for this BUG"
 puts "=================================="
 
 restore [locate_data_file pro20333a.brep] result
+EnsureTolRule result result
 checkshape result
 
 tclean result
diff --git a/tests/bugs/step/buc60948 b/tests/bugs/step/buc60948
index c955bd9059..d06b909b31 100755
--- a/tests/bugs/step/buc60948
+++ b/tests/bugs/step/buc60948
@@ -5,6 +5,7 @@ puts "BUC60948"
 puts "========================"
 
 restore [locate_data_file pump4.brep] a_1 
+EnsureTolRule a_1 a_1
 checkshape a_1
 
 #####################################################################
diff --git a/tests/bugs/step/bug630 b/tests/bugs/step/bug630
index 84803156e6..be56d29305 100755
--- a/tests/bugs/step/bug630
+++ b/tests/bugs/step/bug630
@@ -7,6 +7,7 @@ puts ""
 ########################################################
 
 restore [locate_data_file OCC630.brep] a1
+EnsureTolRule a1 a1
 checkshape a1
 
 ######################################################################
diff --git a/tests/bugs/vis/buc60661 b/tests/bugs/vis/buc60661
index 942153655e..88c5574352 100755
--- a/tests/bugs/vis/buc60661
+++ b/tests/bugs/vis/buc60661
@@ -13,6 +13,7 @@ pload XDE
 ##################################################################
 
 restore [locate_data_file buc60661a.brep] buc60661
+EnsureTolRule buc60661 buc60661
 checkshape buc60661
 
 ######################################################################
diff --git a/tests/bugs/vis/bug288_1 b/tests/bugs/vis/bug288_1
index 2d6c8bc28b..aa583116dc 100755
--- a/tests/bugs/vis/bug288_1
+++ b/tests/bugs/vis/bug288_1
@@ -4,6 +4,7 @@ puts "(case 1)"
 puts "========================"
 
 restore [locate_data_file shading_058.brep] result 
+EnsureTolRule result result
 checkshape result
 
 tclean result
diff --git a/tests/bugs/vis/bug288_4 b/tests/bugs/vis/bug288_4
index 45e0302852..c912b74c72 100755
--- a/tests/bugs/vis/bug288_4
+++ b/tests/bugs/vis/bug288_4
@@ -4,6 +4,7 @@ puts "(case 4)"
 puts "========================"
 
 restore [locate_data_file shading_151.brep] result 
+EnsureTolRule result result
 checkshape result
 
 tclean result
diff --git a/tests/bugs/xde/bug859 b/tests/bugs/xde/bug859
index f32730984c..8df3d6adc4 100755
--- a/tests/bugs/xde/bug859
+++ b/tests/bugs/xde/bug859
@@ -8,6 +8,7 @@ puts ""
 ##################### 
 
 restore [locate_data_file OCC859.brep] a
+EnsureTolRule a a
 checkshape a
 
 sewing result a
diff --git a/tests/bugs/xde/bug861 b/tests/bugs/xde/bug861
index 255f2aa920..7ec259928e 100755
--- a/tests/bugs/xde/bug861
+++ b/tests/bugs/xde/bug861
@@ -8,6 +8,7 @@ puts ""
 ######################################################
 
 restore [locate_data_file OCC859.brep] result
+EnsureTolRule result result
 checkshape result
 
 freebounds result 0.1
diff --git a/tests/feat/featlf/B8 b/tests/feat/featlf/B8
index 8f31d324c8..9cbaf10761 100644
--- a/tests/feat/featlf/B8
+++ b/tests/feat/featlf/B8
@@ -2,6 +2,7 @@
 # Date : 26 Nov 98
 
 restore [locate_data_file cts21832_base.brep] base
+EnsureTolRule base base
 restore [locate_data_file cts21832_cont.brep] cont
 
 explode cont wire
diff --git a/tests/feat/featprism/L2 b/tests/feat/featprism/L2
index 0233bc1fcb..268c77cf53 100644
--- a/tests/feat/featprism/L2
+++ b/tests/feat/featprism/L2
@@ -2,6 +2,7 @@
 # Date : 23mar98
 
 restore [locate_data_file CTO900_ger60224-part.rle] base
+EnsureTolRule base base
 restore [locate_data_file ger60224-tool.rle] wire
 
 mkplane cont wire
diff --git a/tests/feat/featprism/L8 b/tests/feat/featprism/L8
index f4afb47bde..067df87236 100644
--- a/tests/feat/featprism/L8
+++ b/tests/feat/featprism/L8
@@ -2,6 +2,7 @@
 # Date : 10 Sept 98
 
 restore [locate_data_file CTO900_pro12880c.rle] base
+EnsureTolRule base base
 restore [locate_data_file pro12880_face.rle] cont
 
 featprism base cont cont 0 1 0 1 1
diff --git a/tests/feat/featprism/M1 b/tests/feat/featprism/M1
index d470b1bed3..46f24ba590 100644
--- a/tests/feat/featprism/M1
+++ b/tests/feat/featprism/M1
@@ -2,6 +2,7 @@
 # Date : 15 Sept 98
 
 restore [locate_data_file CTO900_ger50084c.rle] base
+EnsureTolRule base base
 restore [locate_data_file ger50084_face.rle] wire
 
 ## contour est un wire -> on en fait une face
diff --git a/tests/feat/featprism/O6 b/tests/feat/featprism/O6
index 838df0cdaf..9d56210650 100644
--- a/tests/feat/featprism/O6
+++ b/tests/feat/featprism/O6
@@ -7,6 +7,7 @@
 cpulimit 2000
 
 restore [locate_data_file CFE900_cts20geq.rle] base
+EnsureTolRule base base
 restore [locate_data_file cts20960_face.brep] cont
 
 explode base face
diff --git a/tests/feat/featprism/O9 b/tests/feat/featprism/O9
index 78b6a21af4..096fa3b8c3 100644
--- a/tests/feat/featprism/O9
+++ b/tests/feat/featprism/O9
@@ -2,6 +2,7 @@
 # Date : 25 Nov 98
 
 restore [locate_data_file cts20088_base.brep] base
+EnsureTolRule base base
 restore [locate_data_file contour_pkv.rle] cont
 
 explode base face
diff --git a/tests/feat/featprism/R1 b/tests/feat/featprism/R1
index 51fea72bdc..ceb531cbdb 100644
--- a/tests/feat/featprism/R1
+++ b/tests/feat/featprism/R1
@@ -2,6 +2,7 @@
 # Date : 02 Dec 98
 
 restore [locate_data_file CFE900_pro16gff.rle] base
+EnsureTolRule base base
 restore [locate_data_file pro16769_face.brep] cont
 
 explode base face
diff --git a/tests/feat/featprism/S1 b/tests/feat/featprism/S1
index 0712516208..a0253a6fb3 100644
--- a/tests/feat/featprism/S1
+++ b/tests/feat/featprism/S1
@@ -1,6 +1,7 @@
 # cts20088
 
 restore [locate_data_file cts20088_base.brep] base
+EnsureTolRule base base
 restore [locate_data_file contour_pkv.rle] cont
 
 explode base face
diff --git a/tests/feat/featprism/S2 b/tests/feat/featprism/S2
index 9d1074da4c..473434f4da 100644
--- a/tests/feat/featprism/S2
+++ b/tests/feat/featprism/S2
@@ -2,6 +2,7 @@
 puts "TODO OCC22810 ALL: Error : The area of the resulting shape is"
 
 restore [locate_data_file cts20088_base.brep] base
+EnsureTolRule base base
 restore [locate_data_file contour_pkv.rle] cont
 
 explode base face
diff --git a/tests/heal/drop_small_edges/end b/tests/heal/drop_small_edges/end
index d10f90f3fe..efa992396e 100644
--- a/tests/heal/drop_small_edges/end
+++ b/tests/heal/drop_small_edges/end
@@ -1,4 +1,5 @@
 puts [fixsmall result a 1]
+EnsureTolRule result result
 if { [isdraw result] } {
   puts [checkshape result]
 }
diff --git a/tests/heal/fix_face_size/end b/tests/heal/fix_face_size/end
index 26b85aef23..3f067b0e07 100644
--- a/tests/heal/fix_face_size/end
+++ b/tests/heal/fix_face_size/end
@@ -1,2 +1,3 @@
 puts [DT_ApplySeq result a MDTV ToV4]
+EnsureTolRule result result
 puts [checkshape result]
diff --git a/tests/heal/fix_gaps/end b/tests/heal/fix_gaps/end
index f02df9b4bc..883c119995 100644
--- a/tests/heal/fix_gaps/end
+++ b/tests/heal/fix_gaps/end
@@ -1,2 +1,3 @@
 fixwgaps result a 0.001
+EnsureTolRule result result
 puts [checkshape result]
diff --git a/tests/heal/split_angle_advanced/end b/tests/heal/split_angle_advanced/end
index 27c5713184..ab9e9d5eb8 100644
--- a/tests/heal/split_angle_advanced/end
+++ b/tests/heal/split_angle_advanced/end
@@ -1,3 +1,4 @@
 puts [DT_SplitAngle result a]
+EnsureTolRule result result
 puts [checkshape result]
 
diff --git a/tests/heal/surface_to_bspline/end b/tests/heal/surface_to_bspline/end
index 6243b1f636..1c6197fc3d 100644
--- a/tests/heal/surface_to_bspline/end
+++ b/tests/heal/surface_to_bspline/end
@@ -1,2 +1,3 @@
 puts [DT_ToBspl result a]
+EnsureTolRule result result
 puts [checkshape result]
diff --git a/tests/sewing/tol_0_01/T1 b/tests/sewing/tol_0_01/T1
index 6d41e1f208..8675033420 100644
--- a/tests/sewing/tol_0_01/T1
+++ b/tests/sewing/tol_0_01/T1
@@ -1 +1,2 @@
 restore [locate_data_file CFE900_pro16gdo.rle] a
+EnsureTolRule a a