diff --git a/tests/bugs/caf/bug27604 b/tests/bugs/caf/bug27604
index 8d2806b421..5f5c9d5137 100644
--- a/tests/bugs/caf/bug27604
+++ b/tests/bugs/caf/bug27604
@@ -11,16 +11,18 @@ pload OCAF MODELING
 # just a big shape to fit in memory
 restore [locate_data_file $aBigShape] s
 
+file delete ${imagedir}/test.cbf
+
 # store it in the document
 NewDocument D BinOcaf
 SetShape D "0:2" s
-SaveAs D test.cbf
+SaveAs D ${imagedir}/test.cbf
 Close D
 
 # store the memory used before opening a document
 set aBefore [meminfo h]
 
-Open test.cbf DD
+Open ${imagedir}/test.cbf DD
 set aDocLoaded [meminfo h]
 set aBigDelta [expr $aDocLoaded - $aBefore]
 Close DD
diff --git a/tests/bugs/caf/bug27835 b/tests/bugs/caf/bug27835
index c336fed384..043da72b96 100644
--- a/tests/bugs/caf/bug27835
+++ b/tests/bugs/caf/bug27835
@@ -23,11 +23,12 @@ vrotate 3 0 0
 vsetdispmode 1
 vdump $anImgDoc1
 
+file delete ${imagedir}/test.xbf
 StoreTriangulation 1
-SaveAs D test.xbf
+SaveAs D ${imagedir}/test.xbf
 Close D
 
-XOpen test.xbf D
+XOpen ${imagedir}/test.xbf D
 XShow D
 vsetdispmode 1
 vaxo