--- lib/Apache/Test.pm	2005/07/14 00:08:54	1.1
+++ lib/Apache/Test.pm	2005/07/14 00:16:16
@@ -52,6 +52,7 @@
 my $Config;
 my $real_plan;
 my @testmore;
+my $Builder;
 
 sub import {
     my $class = shift;
@@ -73,6 +74,7 @@
             @testmore = (import => [qw(!plan)]);
 
             Test::More->import(@testmore);
+            $Builder = Test::More->builder;
 
             \&Test::More::plan;
         } or die "-withtestmore error: $@";
@@ -132,17 +134,17 @@
 #so Perl's Test.pm can be run inside mod_perl
 sub test_pm_refresh {
     if (@testmore) {
-        Test::Builder->reset;
+        $Builder->reset;
 
-        Test::Builder->output(\*STDOUT);
-        Test::Builder->todo_output(\*STDOUT);
+        $Builder->output(\*STDOUT);
+        $Builder->todo_output(\*STDOUT);
 
         # this is STDOUT because Test::More seems to put 
         # most of the stuff we want on STDERR, so it ends
         # up in the error_log instead of where the user can
         # see it.   consider leaving it alone based on
         # later user reports.
-        Test::Builder->failure_output(\*STDOUT);
+        $Builder->failure_output(\*STDOUT);
     }
     else {
         $Test::TESTOUT = \*STDOUT;