1 files changed, 9 insertions, 1 deletions
diff --git a/lib/CGI/t/request.t b/lib/CGI/t/request.t
index 96775a9279..5c79050f49 100755
--- a/lib/CGI/t/request.t
+++ b/lib/CGI/t/request.t
@@ -1,8 +1,16 @@
 #!/usr/local/bin/perl -w
 
+BEGIN {
+	chdir 't' if -d 't';
+	if ($ENV{PERL_CORE}) {
+		@INC = '../lib';
+	} else {
+		unshift @INC, qw( ../blib/lib ../blib/arch lib );
+	}
+}
+
 # Test ability to retrieve HTTP request info
 ######################### We start with some black magic to print on failure.
-use lib '../blib/lib','../blib/arch';
 
 BEGIN {$| = 1; print "1..33\n"; }
 END {print "not ok 1\n" unless $loaded;}