1 files changed, 10 insertions, 5 deletions
diff --git a/lib/CGI/t/form.t b/lib/CGI/t/form.t
index 344e7f0276..ae6ed59eef 100755
--- a/lib/CGI/t/form.t
+++ b/lib/CGI/t/form.t
@@ -1,10 +1,15 @@
 #!/usr/local/bin/perl -w
 
-use lib qw(t/lib);
-
-# Due to a bug in older versions of MakeMaker & Test::Harness, we must
-# ensure the blib's are in @INC, else we might use the core CGI.pm
-use lib qw(blib/lib blib/arch);
+BEGIN {
+	chdir 't' if -d 't';
+	if ($ENV{PERL_CORE}) {
+		@INC = '../lib';
+	} else {
+		# Due to a bug in older versions of MakeMaker & Test::Harness, we must
+		# ensure the blib's are in @INC, else we might use the core CGI.pm
+		unshift @INC, qw( ../blib/lib ../blib/arch lib );
+	}
+}
 
 use Test::More tests => 17;