diff --git a/test/bug.annual.t b/test/bug.annual.t
index 5efc3e45c..b3ec05360 100755
--- a/test/bug.annual.t
+++ b/test/bug.annual.t
@@ -33,8 +33,12 @@ use Test::More tests => 11;
 delete $ENV{'TASKDATA'};
 delete $ENV{'TASKRC'};
 
+use File::Basename;
+my $ut = basename ($0);
+my $rc = $ut . '.rc';
+
 # Create the rc file.
-if (open my $fh, '>', 'annual.rc')
+if (open my $fh, '>', $rc)
 {
   print $fh "data.location=.\n",
             "dateformat=m/d/Y\n",
@@ -62,23 +66,23 @@ if (open my $fh, '>', 'annual.rc')
 #  2 1/1/2000   foo
 #  3 1/1/2001   foo
 
-qx{../src/task rc:annual.rc add foo due:1/1/2000 recur:annual until:1/1/2009 2>&1};
-my $output = qx{../src/task rc:annual.rc annual 2>&1};
-like ($output, qr/2\s+1\/1\/2000\s+foo/,  'synthetic 2 no creep');
-like ($output, qr/3\s+1\/1\/2001\s+foo/,  'synthetic 3 no creep');
-like ($output, qr/4\s+1\/1\/2002\s+foo/,  'synthetic 4 no creep');
-like ($output, qr/5\s+1\/1\/2003\s+foo/,  'synthetic 5 no creep');
-like ($output, qr/6\s+1\/1\/2004\s+foo/,  'synthetic 6 no creep');
-like ($output, qr/7\s+1\/1\/2005\s+foo/,  'synthetic 7 no creep');
-like ($output, qr/8\s+1\/1\/2006\s+foo/,  'synthetic 8 no creep');
-like ($output, qr/9\s+1\/1\/2007\s+foo/,  'synthetic 9 no creep');
-like ($output, qr/10\s+1\/1\/2008\s+foo/, 'synthetic 10 no creep');
-like ($output, qr/11\s+1\/1\/2009\s+foo/, 'synthetic 11 no creep');
+qx{../src/task rc:$rc add foo due:1/1/2000 recur:annual until:1/1/2009 2>&1};
+my $output = qx{../src/task rc:$rc annual 2>&1};
+like ($output, qr/2\s+1\/1\/2000\s+foo/,  "$ut: synthetic 2 no creep");
+like ($output, qr/3\s+1\/1\/2001\s+foo/,  "$ut: synthetic 3 no creep");
+like ($output, qr/4\s+1\/1\/2002\s+foo/,  "$ut: synthetic 4 no creep");
+like ($output, qr/5\s+1\/1\/2003\s+foo/,  "$ut: synthetic 5 no creep");
+like ($output, qr/6\s+1\/1\/2004\s+foo/,  "$ut: synthetic 6 no creep");
+like ($output, qr/7\s+1\/1\/2005\s+foo/,  "$ut: synthetic 7 no creep");
+like ($output, qr/8\s+1\/1\/2006\s+foo/,  "$ut: synthetic 8 no creep");
+like ($output, qr/9\s+1\/1\/2007\s+foo/,  "$ut: synthetic 9 no creep");
+like ($output, qr/10\s+1\/1\/2008\s+foo/, "$ut: synthetic 10 no creep");
+like ($output, qr/11\s+1\/1\/2009\s+foo/, "$ut: synthetic 11 no creep");
 
-$output = qx{../src/task rc:annual.rc diag 2>&1};
-like ($output, qr/No duplicates found/, 'No duplicate UUIDs detected');
+$output = qx{../src/task rc:$rc diag 2>&1};
+like ($output, qr/No duplicates found/,   "$ut: No duplicate UUIDs detected");
 
 # Cleanup.
-unlink qw(pending.data completed.data undo.data backlog.data annual.rc);
+unlink qw(pending.data completed.data undo.data backlog.data), $rc;
 exit 0;