diff --git a/tests/3rdparty/fonts/A3 b/tests/3rdparty/fonts/A3
index e438cffa51..61b922f707 100644
--- a/tests/3rdparty/fonts/A3
+++ b/tests/3rdparty/fonts/A3
@@ -6,7 +6,7 @@ puts ""
 
 vtrihedron trihedr
 
-set aFileHandle [open "$::env(CASROOT)/data/step/screw.step" r]
+set aFileHandle [open [locate_data_file screw.step] r]
 set aText [read $aFileHandle]
 close $aFileHandle
 
diff --git a/tests/3rdparty/fonts/A4 b/tests/3rdparty/fonts/A4
index c0cda4d1de..ac7b213cea 100644
--- a/tests/3rdparty/fonts/A4
+++ b/tests/3rdparty/fonts/A4
@@ -6,7 +6,7 @@ puts ""
 
 vtrihedron trihedr
 
-set aFileHandle [open "$::env(CASROOT)/data/step/screw.step" r]
+set aFileHandle [open [locate_data_file screw.step] r]
 set aFileData   [read $aFileHandle]
 close $aFileHandle
 
diff --git a/tests/de/end b/tests/de/end
index 1c96dcd23f..9318c45e4d 100644
--- a/tests/de/end
+++ b/tests/de/end
@@ -702,7 +702,7 @@ if { $mist < 1 } {
     }
 }
 fit
-xwd $imagedir/${test_image}.gif
+xwd $imagedir/${test_image}.png
 if { $mist < 1 } {
    if { [catch { Close D_Second } catch_result] } {
       puts "Error : cannot close a document D_Second"