1 files changed, 11 insertions, 5 deletions
diff --git a/testserver.pl b/testserver.pl
index 0d1d08ba5..2211f8bfe 100755
--- a/testserver.pl
+++ b/testserver.pl
@@ -18,17 +18,23 @@
 # as its only argument.  It attempts to troubleshoot as many installation
 # issues as possible.
 
+use strict;
+
+BEGIN {
+    my $envpath = $ENV{'PATH'};
+    require Bugzilla;
+    $ENV{'PATH'} = $envpath;
+}
+
+use lib ".";
+
 use Socket;
 use Bugzilla::Config qw($datadir);
-my $envpath = $ENV{'PATH'};
-use lib ".";
-use strict;
+
 require "globals.pl";
 eval "require LWP; require LWP::UserAgent;";
 my $lwp = $@ ? 0 : 1;
 
-$ENV{'PATH'}= $envpath;
-
 if ((@ARGV != 1) || ($ARGV[0] !~ /^https?:/))
 {
     print "Usage: $0 <URL to this Bugzilla installation>\n";