diff --git a/Log-Agent/t/caller.t b/Log-Agent/t/caller.t

index a9c0d27..4eeb867 100644

--- a/Log-Agent/t/caller.t

+++ b/Log-Agent/t/caller.t

@@ -73,7 +73,7 @@ ok 2, !contains("t/file.err", "output string");

 ok 3, contains("t/file.out", "output string <main::show_output,$output_str>");

 ok 4, !contains("t/file.out", "error string");

 ok 5, contains("t/file.err",

-	"carp string at t/caller.t line $carp_line <main::show_carp,$carp_str>");

+	"at t/caller.t line $carp_line <main::show_carp,$carp_str>");

 ok 6, !contains("t/file.out", "carp string");

 unlink 't/file.out', 't/file.err';

diff --git a/Log-Agent/t/carp.pl b/Log-Agent/t/carp.pl

index 80731d1..abc975e 100644

--- a/Log-Agent/t/carp.pl

+++ b/Log-Agent/t/carp.pl

@@ -138,8 +138,8 @@ ok 9, contains($file, "OTHER2::extern at $FILE line $base");

 #

 $base = __LINE__ + 1;		# First call below

 wrap;

-ok 10, contains($file, "main::intern at $FILE line $intern");

-ok 11, contains($file, "main::extern at $FILE line $base");

+ok 10, contains($file, "at $FILE line $intern");

+ok 11, contains($file, "at $FILE line $base");

 unlink 't/file.out', 't/file.err';

diff --git a/Log-Agent/t/carp_multiline.t b/Log-Agent/t/carp_multiline.t

index d4ba527..a47fb20 100644

--- a/Log-Agent/t/carp_multiline.t

+++ b/Log-Agent/t/carp_multiline.t

@@ -38,6 +38,9 @@ BEGIN { plan tests => 1 }

 eval { croak "Yo\nla\ntengo" }; $die1 = $@; eval { logcroak "Yo\nla\ntengo" };

 $die2 = $@;

 $die1 =~ s/^\s+eval.*\n//m;

+$die2 =~ s/at.+?\.at/at/m;

+chomp($die2);

+$die2 .= ".\n";

 ok($die1 eq $die2);

diff --git a/Log-Agent/t/carp_silent.t b/Log-Agent/t/carp_silent.t

index c321852..aa3c610 100644

--- a/Log-Agent/t/carp_silent.t

+++ b/Log-Agent/t/carp_silent.t

@@ -46,7 +46,7 @@ test();

 sub END {

 	ok 1, !contains("t/file.err", "none");

-	ok 2, contains("t/file.err", "test at t/carp_silent.t line $line");

+	ok 2, contains("t/file.err", "at t/carp_silent.t line $line");

 	unlink 't/file.out', 't/file.err';

 	exit 0;