11 files changed, 15 insertions, 12 deletions
diff --git a/os2/OS2/ExtAttr/t/os2_ea.t b/os2/OS2/ExtAttr/t/os2_ea.t
index dc6f996564..a1da398d45 100644
--- a/os2/OS2/ExtAttr/t/os2_ea.t
+++ b/os2/OS2/ExtAttr/t/os2_ea.t
@@ -2,7 +2,7 @@ BEGIN {
     chdir 't' if -d 't/lib';
     @INC = '../lib' if -d 'lib';
     require Config; import Config;
-    if (-d 'lib' and $Config{'extensions'} !~ /\bOS2::REXX\b/) {
+    if (-d 'lib' and $Config{'extensions'} !~ /\bOS2(::|\/)REXX\b/) {
 	print "1..0\n";
 	exit 0;
     }
@@ -76,4 +76,4 @@ print "ok 12\n";
 }
 
 print "ok 21\n";
-
+unlink 't.out';
diff --git a/os2/OS2/PrfDB/t/os2_prfdb.t b/os2/OS2/PrfDB/t/os2_prfdb.t
index 4c0883db50..a8c9752d36 100644
--- a/os2/OS2/PrfDB/t/os2_prfdb.t
+++ b/os2/OS2/PrfDB/t/os2_prfdb.t
@@ -2,7 +2,7 @@ BEGIN {
     chdir 't' if -d 't/lib';
     @INC = '../lib' if -d 'lib';
     require Config; import Config;
-    if (-d 'lib' and $Config{'extensions'} !~ /\bOS2::PrfDB\b/) {
+    if (-d 'lib' and $Config{'extensions'} !~ /\bOS2(::|\/)PrfDB\b/) {
 	print "1..0\n";
 	exit 0;
     }
@@ -183,3 +183,6 @@ tie %hash2, 'OS2::PrfDB', $inifile;
 print "ok 47\n";
 
 print ($hash2{nnn}->{mmm} eq "67" ? "ok 48\n" : "not ok 48\n# `$val'\n");
+
+untie %hash2;
+unlink $inifile;
diff --git a/os2/OS2/REXX/t/rx_cmprt.t b/os2/OS2/REXX/t/rx_cmprt.t
index a73e43e36e..f2113e3aa3 100644
--- a/os2/OS2/REXX/t/rx_cmprt.t
+++ b/os2/OS2/REXX/t/rx_cmprt.t
@@ -2,7 +2,7 @@ BEGIN {
     chdir 't' if -d 't/lib';
     @INC = '../lib' if -d 'lib';
     require Config; import Config;
-    if (-d 'lib' and $Config{'extensions'} !~ /\bOS2::REXX\b/) {
+    if (-d 'lib' and $Config{'extensions'} !~ /\bOS2(::|\/)REXX\b/) {
 	print "1..0\n";
 	exit 0;
     }
diff --git a/os2/OS2/REXX/t/rx_dllld.t b/os2/OS2/REXX/t/rx_dllld.t
index 317743f3cb..9d81bf3e56 100644
--- a/os2/OS2/REXX/t/rx_dllld.t
+++ b/os2/OS2/REXX/t/rx_dllld.t
@@ -2,7 +2,7 @@ BEGIN {
     chdir 't' if -d 't/lib';
     @INC = '../lib' if -d 'lib';
     require Config; import Config;
-    if (-d 'lib' and $Config{'extensions'} !~ /\bOS2::REXX\b/) {
+    if (-d 'lib' and $Config{'extensions'} !~ /\bOS2(::|\/)REXX\b/) {
 	print "1..0\n";
 	exit 0;
     }
diff --git a/os2/OS2/REXX/t/rx_objcall.t b/os2/OS2/REXX/t/rx_objcall.t
index b4f04c308a..cb3c52a8b6 100644
--- a/os2/OS2/REXX/t/rx_objcall.t
+++ b/os2/OS2/REXX/t/rx_objcall.t
@@ -2,7 +2,7 @@ BEGIN {
     chdir 't' if -d 't/lib';
     @INC = '../lib' if -d 'lib';
     require Config; import Config;
-    if (-d 'lib' and $Config{'extensions'} !~ /\bOS2::REXX\b/) {
+    if (-d 'lib' and $Config{'extensions'} !~ /\bOS2(::|\/)REXX\b/) {
 	print "1..0\n";
 	exit 0;
     }
diff --git a/os2/OS2/REXX/t/rx_sql.test b/os2/OS2/REXX/t/rx_sql.test
index 4f984250a3..602c76dc47 100644
--- a/os2/OS2/REXX/t/rx_sql.test
+++ b/os2/OS2/REXX/t/rx_sql.test
@@ -2,7 +2,7 @@ BEGIN {
     chdir 't' if -d 't/lib';
     @INC = '../lib';
     require Config; import Config;
-    if ($Config{'extensions'} !~ /\bOS2::REXX\b/) {
+    if ($Config{'extensions'} !~ /\bOS2(::|\/)REXX\b/) {
 	print "1..0\n";
 	exit 0;
     }
diff --git a/os2/OS2/REXX/t/rx_tiesql.test b/os2/OS2/REXX/t/rx_tiesql.test
index 2947516755..c85a1e990b 100644
--- a/os2/OS2/REXX/t/rx_tiesql.test
+++ b/os2/OS2/REXX/t/rx_tiesql.test
@@ -2,7 +2,7 @@ BEGIN {
     chdir 't' if -d 't/lib';
     @INC = '../lib';
     require Config; import Config;
-    if ($Config{'extensions'} !~ /\bOS2::REXX\b/) {
+    if ($Config{'extensions'} !~ /\bOS2(::|\/)REXX\b/) {
 	print "1..0\n";
 	exit 0;
     }
diff --git a/os2/OS2/REXX/t/rx_tievar.t b/os2/OS2/REXX/t/rx_tievar.t
index 6132e23f80..77f90c2f59 100644
--- a/os2/OS2/REXX/t/rx_tievar.t
+++ b/os2/OS2/REXX/t/rx_tievar.t
@@ -2,7 +2,7 @@ BEGIN {
     chdir 't' if -d 't/lib';
     @INC = '../lib' if -d 'lib';
     require Config; import Config;
-    if (-d 'lib' and $Config{'extensions'} !~ /\bOS2::REXX\b/) {
+    if (-d 'lib' and $Config{'extensions'} !~ /\bOS2(::|\/)REXX\b/) {
 	print "1..0\n";
 	exit 0;
     }
diff --git a/os2/OS2/REXX/t/rx_tieydb.t b/os2/OS2/REXX/t/rx_tieydb.t
index 8251051265..30a2dafb62 100644
--- a/os2/OS2/REXX/t/rx_tieydb.t
+++ b/os2/OS2/REXX/t/rx_tieydb.t
@@ -2,7 +2,7 @@ BEGIN {
     chdir 't' if -d 't/lib';
     @INC = '../lib' if -d 'lib';
     require Config; import Config;
-    if (-d 'lib' and $Config{'extensions'} !~ /\bOS2::REXX\b/) {
+    if (-d 'lib' and $Config{'extensions'} !~ /\bOS2(::|\/)REXX\b/) {
 	print "1..0\n";
 	exit 0;
     }
diff --git a/os2/OS2/REXX/t/rx_varset.t b/os2/OS2/REXX/t/rx_varset.t
index 9d4f3b2e56..166cf53623 100644
--- a/os2/OS2/REXX/t/rx_varset.t
+++ b/os2/OS2/REXX/t/rx_varset.t
@@ -2,7 +2,7 @@ BEGIN {
     chdir 't' if -d 't/lib';
     @INC = '../lib' if -d 'lib';
     require Config; import Config;
-    if (-d 'lib' and $Config{'extensions'} !~ /\bOS2::REXX\b/) {
+    if (-d 'lib' and $Config{'extensions'} !~ /\bOS2(::|\/)REXX\b/) {
 	print "1..0\n";
 	exit 0;
     }
diff --git a/os2/OS2/REXX/t/rx_vrexx.t b/os2/OS2/REXX/t/rx_vrexx.t
index a40749f55f..04ca6636db 100644
--- a/os2/OS2/REXX/t/rx_vrexx.t
+++ b/os2/OS2/REXX/t/rx_vrexx.t
@@ -2,7 +2,7 @@ BEGIN {
     chdir 't' if -d 't/lib';
     @INC = '../lib' if -d 'lib';
     require Config; import Config;
-    if (-d 'lib' and $Config{'extensions'} !~ /\bOS2::REXX\b/) {
+    if (-d 'lib' and $Config{'extensions'} !~ /\bOS2(::|\/)REXX\b/) {
 	print "1..0\n";
 	exit 0;
     }