5 files changed, 16 insertions, 13 deletions
diff --git a/t/op/coreamp.t b/t/op/coreamp.t
index 3320ff75d2..b57609bef0 100644
--- a/t/op/coreamp.t
+++ b/t/op/coreamp.t
@@ -9,9 +9,10 @@
 
 BEGIN {
     chdir 't' if -d 't';
-    require "./test.pl"; require './charset_tools.pl';
-    $^P |= 0x100;
+    require "./test.pl";
     set_up_inc( qw(. ../lib ../dist/if) );
+	require './charset_tools.pl';
+    $^P |= 0x100;	# Provide informative "file" names for evals
 }
 
 no warnings 'experimental::smartmatch';
diff --git a/t/op/goto.t b/t/op/goto.t
index db08e1e2c1..80c99d20b1 100644
--- a/t/op/goto.t
+++ b/t/op/goto.t
@@ -4,8 +4,9 @@
 
 BEGIN {
     chdir 't' if -d 't';
-    require "./test.pl"; require './charset_tools.pl';
+    require "./test.pl";
     set_up_inc( qw(. ../lib) );
+	require './charset_tools.pl';
 }
 
 use warnings;
diff --git a/t/op/split.t b/t/op/split.t
index 7377616564..64b11d4640 100644
--- a/t/op/split.t
+++ b/t/op/split.t
@@ -3,8 +3,8 @@
 BEGIN {
     chdir 't' if -d 't';
     require './test.pl';
-    require './charset_tools.pl';
     set_up_inc('../lib');
+    require './charset_tools.pl';
 }
 
 plan tests => 178;
diff --git a/t/op/sprintf2.t b/t/op/sprintf2.t
index 7cb5d9bf40..bbc12ccd0a 100644
--- a/t/op/sprintf2.t
+++ b/t/op/sprintf2.t
@@ -5,8 +5,8 @@
 BEGIN {
     chdir 't' if -d 't';
     require './test.pl';
-    require './charset_tools.pl';
     set_up_inc('../lib');
+    require './charset_tools.pl';
 }   
 
 # We'll run 12 extra tests (see below) if $Q is false.
diff --git a/t/op/warn.t b/t/op/warn.t
index 0bf6967a60..739110549d 100644
--- a/t/op/warn.t
+++ b/t/op/warn.t
@@ -3,8 +3,9 @@
 
 BEGIN {
     chdir 't' if -d 't';
-    require './test.pl'; require './charset_tools.pl';
+    require './test.pl';
     set_up_inc('../lib');
+    require './charset_tools.pl';
 }
 
 plan 33;
@@ -26,7 +27,7 @@ ok @warnings==1 && $warnings[0] eq "foobar\n";
 @warnings = ();
 $@ = "";
 warn "foo";
-ok @warnings==1 && $warnings[0] eq "foo at warn.t line 28.\n";
+ok @warnings==1 && $warnings[0] eq "foo at warn.t line 29.\n";
 
 @warnings = ();
 $@ = "";
@@ -37,13 +38,13 @@ ok @warnings==1 && ref($warnings[0]) eq "ARRAY" && $warnings[0] == $wa;
 $@ = "";
 warn "";
 ok @warnings==1 &&
-    $warnings[0] eq "Warning: something's wrong at warn.t line 38.\n";
+    $warnings[0] eq "Warning: something's wrong at warn.t line 39.\n";
 
 @warnings = ();
 $@ = "";
 warn;
 ok @warnings==1 &&
-    $warnings[0] eq "Warning: something's wrong at warn.t line 44.\n";
+    $warnings[0] eq "Warning: something's wrong at warn.t line 45.\n";
 
 @warnings = ();
 $@ = "ERR\n";
@@ -58,7 +59,7 @@ ok @warnings==1 && $warnings[0] eq "foobar\n";
 @warnings = ();
 $@ = "ERR\n";
 warn "foo";
-ok @warnings==1 && $warnings[0] eq "foo at warn.t line 60.\n";
+ok @warnings==1 && $warnings[0] eq "foo at warn.t line 61.\n";
 
 @warnings = ();
 $@ = "ERR\n";
@@ -69,13 +70,13 @@ ok @warnings==1 && ref($warnings[0]) eq "ARRAY" && $warnings[0] == $wa;
 $@ = "ERR\n";
 warn "";
 ok @warnings==1 &&
-    $warnings[0] eq "ERR\n\t...caught at warn.t line 70.\n";
+    $warnings[0] eq "ERR\n\t...caught at warn.t line 71.\n";
 
 @warnings = ();
 $@ = "ERR\n";
 warn;
 ok @warnings==1 &&
-    $warnings[0] eq "ERR\n\t...caught at warn.t line 76.\n";
+    $warnings[0] eq "ERR\n\t...caught at warn.t line 77.\n";
 
 @warnings = ();
 $@ = $ea;
@@ -90,7 +91,7 @@ ok @warnings==1 && $warnings[0] eq "foobar\n";
 @warnings = ();
 $@ = $ea;
 warn "foo";
-ok @warnings==1 && $warnings[0] eq "foo at warn.t line 92.\n";
+ok @warnings==1 && $warnings[0] eq "foo at warn.t line 93.\n";
 
 @warnings = ();
 $@ = $ea;