4 files changed, 28 insertions, 0 deletions
diff --git a/lib/base/t/base.t b/lib/base/t/base.t
index 8d32064cc1..8a9f3eaea0 100644
--- a/lib/base/t/base.t
+++ b/lib/base/t/base.t
@@ -1,5 +1,12 @@
 #!/usr/bin/perl -w
 
+BEGIN {
+   if( $ENV{PERL_CORE} ) {
+        chdir 't' if -d 't';
+        @INC = qw(../lib);
+    }
+}
+
 use strict;
 use Test::More tests => 11;
 
diff --git a/lib/base/t/fields-base.t b/lib/base/t/fields-base.t
index e489f7bec0..0ec12c225e 100644
--- a/lib/base/t/fields-base.t
+++ b/lib/base/t/fields-base.t
@@ -1,5 +1,12 @@
 #!/usr/bin/perl -w
 
+BEGIN {
+   if( $ENV{PERL_CORE} ) {
+        chdir 't' if -d 't';
+        @INC = qw(../lib);
+    }
+}
+
 my ($Has_PH, $Field);
 BEGIN { 
     $Has_PH = $] < 5.009;
diff --git a/lib/base/t/fields.t b/lib/base/t/fields.t
index 4999cfed14..e9c32a283d 100644
--- a/lib/base/t/fields.t
+++ b/lib/base/t/fields.t
@@ -1,5 +1,12 @@
 #!/usr/bin/perl -w
 
+BEGIN {
+   if( $ENV{PERL_CORE} ) {
+        chdir 't' if -d 't';
+        @INC = qw(../lib);
+    }
+}
+
 my $Has_PH;
 BEGIN {
     $Has_PH = $] < 5.009;
diff --git a/lib/base/t/warnings.t b/lib/base/t/warnings.t
index 51e91741ea..631cc37b7f 100644
--- a/lib/base/t/warnings.t
+++ b/lib/base/t/warnings.t
@@ -1,5 +1,12 @@
 #!/usr/bin/perl -w
 
+BEGIN {
+   if( $ENV{PERL_CORE} ) {
+        chdir 't' if -d 't';
+        @INC = qw(../lib);
+    }
+}
+
 use strict;
 
 use Test::More tests => 1;