diff -ru perl-5.8.1-RC2.orig/ext/Encode/t/enc_eucjp.t perl-5.8.1-RC2/ext/Encode/t/enc_eucjp.t
--- perl-5.8.1-RC2.orig/ext/Encode/t/enc_eucjp.t	2003-07-10 02:10:44.000000000 -0400
+++ perl-5.8.1-RC2/ext/Encode/t/enc_eucjp.t	2003-07-21 11:41:51.922003000 -0400
@@ -31,8 +31,14 @@
 
 for my $i (0..$#c) {
   no warnings 'pack';
-  push @f, "f$i";
-  open(F, ">f$i") or die "$0: failed to open 'f$i' for writing: $!";
+  if ( $^O eq 'VMS' ) {
+      push @f, "f$i.";
+      open(F, ">f$i.") or die "$0: failed to open 'f$i.' for writing: $!";
+  }
+  else {
+      push @f, "f$i";
+      open(F, ">f$i") or die "$0: failed to open 'f$i' for writing: $!";
+  }
   binmode(F, ":utf8");
   print F chr($c[$i]);
   print F pack("C" => $c[$i]);
@@ -42,7 +48,12 @@
 my $t = 1;
 
 for my $i (0..$#c) {
-  open(F, "<f$i") or die "$0: failed to open 'f$i' for reading: $!";
+  if ( $^O eq 'VMS' ) {
+      open(F, "<f$i.") or die "$0: failed to open 'f$i.' for reading: $!";
+  }
+  else {
+      open(F, "<f$i") or die "$0: failed to open 'f$i' for reading: $!";
+  }
   binmode(F, ":utf8");
   my $c = <F>;
   my $o = ord($c);
@@ -52,12 +63,23 @@
 
 my $f = "f" . @f;
 
-push @f, $f;
-open(F, ">$f") or die "$0: failed to open '$f' for writing: $!";
+if ( $^O eq 'VMS' ) {
+    push @f, "$f.";
+    open(F, ">$f.") or die "$0: failed to open '$f.' for writing: $!";
+}
+else {
+    push @f, $f;
+    open(F, ">$f") or die "$0: failed to open '$f' for writing: $!";
+}
 binmode(F, ":raw"); # Output raw bytes.
 print F chr(128); # Output illegal UTF-8.
 close F;
-open(F, $f) or die "$0: failed to open '$f' for reading: $!";
+if ( $^O eq 'VMS' ) {
+    open(F, "$f.") or die "$0: failed to open '$f.' for reading: $!";
+}
+else {
+    open(F, $f) or die "$0: failed to open '$f' for reading: $!";
+}
 binmode(F, ":encoding(utf-8)");
 {
 	local $^W = 1;
diff -ru perl-5.8.1-RC2.orig/ext/Encode/t/enc_utf8.t perl-5.8.1-RC2/ext/Encode/t/enc_utf8.t
--- perl-5.8.1-RC2.orig/ext/Encode/t/enc_utf8.t	2003-07-10 02:10:44.000000000 -0400
+++ perl-5.8.1-RC2/ext/Encode/t/enc_utf8.t	2003-07-21 11:41:42.272003000 -0400
@@ -26,8 +26,14 @@
 my @f;
 
 for my $i (0..$#c) {
-  push @f, "f$i";
-  open(F, ">f$i") or die "$0: failed to open 'f$i' for writing: $!";
+  if ( $^O eq 'VMS' ) {
+      push @f, "f$i.";
+      open(F, ">f$i.") or die "$0: failed to open 'f$i.' for writing: $!";
+  }
+  else {
+      push @f, "f$i";
+      open(F, ">f$i") or die "$0: failed to open 'f$i' for writing: $!";
+  }
   binmode(F, ":utf8");
   print F chr($c[$i]);
   close F;
@@ -36,7 +42,12 @@
 my $t = 1;
 
 for my $i (0..$#c) {
-  open(F, "<f$i") or die "$0: failed to open 'f$i' for reading: $!";
+  if ( $^O eq 'VMS' ) {
+      open(F, "<f$i.") or die "$0: failed to open 'f$i.' for reading: $!";
+  }
+  else {
+      open(F, "<f$i") or die "$0: failed to open 'f$i' for reading: $!";
+  }
   binmode(F, ":utf8");
   my $c = <F>;
   my $o = ord($c);
@@ -46,12 +57,23 @@
 
 my $f = "f" . @f;
 
-push @f, $f;
-open(F, ">$f") or die "$0: failed to open '$f' for writing: $!";
+if ( $^O eq 'VMS' ) {
+    push @f, "$f.";
+    open(F, ">$f.") or die "$0: failed to open '$f.' for writing: $!";
+}
+else {
+    push @f, $f;
+    open(F, ">$f") or die "$0: failed to open '$f' for writing: $!";
+}
 binmode(F, ":raw"); # Output raw bytes.
 print F chr(128); # Output illegal UTF-8.
 close F;
-open(F, $f) or die "$0: failed to open '$f' for reading: $!";
+if ( $^O eq 'VMS' ) {
+    open(F, "$f.") or die "$0: failed to open '$f.' for reading: $!";
+}
+else {
+    open(F, $f) or die "$0: failed to open '$f' for reading: $!";
+}
 binmode(F, ":encoding(utf-8)");
 {
 	local $^W = 1;
diff -ru perl-5.8.1-RC2.orig/ext/Encode/t/perlio.t perl-5.8.1-RC2/ext/Encode/t/perlio.t
--- perl-5.8.1-RC2.orig/ext/Encode/t/perlio.t	2003-07-10 02:10:45.000000000 -0400
+++ perl-5.8.1-RC2/ext/Encode/t/perlio.t	2003-07-21 11:43:06.418003000 -0400
@@ -122,7 +122,10 @@
 		dump2file("$pfile.$seq", $dtext);
 	    }
 	}
-	$DEBUG or unlink ($sfile, $pfile);
+	if ( ! $DEBUG ) {
+            1 while unlink ($sfile);
+            1 while unlink ($pfile);
+        }
     }
 }