3 files changed, 24 insertions, 0 deletions
diff --git a/cpan/ExtUtils-CBuilder/t/00-have-compiler.t b/cpan/ExtUtils-CBuilder/t/00-have-compiler.t
index 245bce571e..cf62e97f2f 100644
--- a/cpan/ExtUtils-CBuilder/t/00-have-compiler.t
+++ b/cpan/ExtUtils-CBuilder/t/00-have-compiler.t
@@ -4,6 +4,12 @@ use File::Spec;
 my $perl;
 BEGIN {
   $perl = File::Spec->rel2abs($^X);
+  if ($ENV{PERL_CORE}) {
+    chdir 't' if -d 't';
+    chdir '../lib/ExtUtils/CBuilder'
+      or die "Can't chdir to lib/ExtUtils/CBuilder: $!";
+    @INC = qw(../..);
+  }
 }
 
 use strict;
diff --git a/cpan/ExtUtils-CBuilder/t/01-basic.t b/cpan/ExtUtils-CBuilder/t/01-basic.t
index 66a025f01a..79a0b0c0eb 100644
--- a/cpan/ExtUtils-CBuilder/t/01-basic.t
+++ b/cpan/ExtUtils-CBuilder/t/01-basic.t
@@ -1,5 +1,14 @@
 #! perl -w
 
+BEGIN {
+  if ($ENV{PERL_CORE}) {
+    chdir 't' if -d 't';
+    chdir '../lib/ExtUtils/CBuilder'
+      or die "Can't chdir to lib/ExtUtils/CBuilder: $!";
+    @INC = qw(../..);
+  }
+}
+
 use strict;
 use Test::More;
 BEGIN { 
diff --git a/cpan/ExtUtils-CBuilder/t/02-link.t b/cpan/ExtUtils-CBuilder/t/02-link.t
index 1e55f6a4e3..c748d3b75a 100644
--- a/cpan/ExtUtils-CBuilder/t/02-link.t
+++ b/cpan/ExtUtils-CBuilder/t/02-link.t
@@ -1,5 +1,14 @@
 #! perl -w
 
+BEGIN {
+  if ($ENV{PERL_CORE}) {
+    chdir 't' if -d 't';
+    chdir '../lib/ExtUtils/CBuilder'
+      or die "Can't chdir to lib/ExtUtils/CBuilder: $!";
+    @INC = qw(../..);
+  }
+}
+
 use strict;
 use Test::More;
 BEGIN {