diff --git a/test/bug.418.t b/test/bug.418.t
index 001f60fe8..9ba89d218 100755
--- a/test/bug.418.t
+++ b/test/bug.418.t
@@ -33,8 +33,12 @@ use Test::More tests => 18;
 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, '>', 'bug.rc')
+if (open my $fh, '>', $rc)
 {
   print $fh "data.location=.\n",
             "dateformat=m/d/Y\n",
@@ -49,39 +53,39 @@ if (open my $fh, '>', 'bug.rc')
 
 # Bug #418: due.before:eow not working
 #   - with dateformat 'MD'
-qx{../src/task rc:bug.rc add one   due:6/28/2010 2>&1};
-qx{../src/task rc:bug.rc add two   due:6/29/2010 2>&1};
-qx{../src/task rc:bug.rc add three due:6/30/2010 2>&1};
-qx{../src/task rc:bug.rc add four  due:7/1/2010 2>&1};
-qx{../src/task rc:bug.rc add five  due:7/2/2010 2>&1};
-qx{../src/task rc:bug.rc add six   due:7/3/2010 2>&1};
-qx{../src/task rc:bug.rc add seven due:7/4/2010 2>&1};
-qx{../src/task rc:bug.rc add eight due:7/5/2010 2>&1};
-qx{../src/task rc:bug.rc add nine  due:7/6/2010 2>&1};
+qx{../src/task rc:$rc add one   due:6/28/2010 2>&1};
+qx{../src/task rc:$rc add two   due:6/29/2010 2>&1};
+qx{../src/task rc:$rc add three due:6/30/2010 2>&1};
+qx{../src/task rc:$rc add four  due:7/1/2010 2>&1};
+qx{../src/task rc:$rc add five  due:7/2/2010 2>&1};
+qx{../src/task rc:$rc add six   due:7/3/2010 2>&1};
+qx{../src/task rc:$rc add seven due:7/4/2010 2>&1};
+qx{../src/task rc:$rc add eight due:7/5/2010 2>&1};
+qx{../src/task rc:$rc add nine  due:7/6/2010 2>&1};
 
-my $output = qx{../src/task rc:bug.rc foo 2>&1};
-like ($output, qr/one/ms,     'task 1 listed');
-like ($output, qr/two/ms,     'task 2 listed');
-like ($output, qr/three/ms,   'task 3 listed');
-like ($output, qr/four/ms,    'task 4 listed');
-like ($output, qr/five/ms,    'task 5 listed');
-like ($output, qr/six/ms,     'task 6 listed');
-like ($output, qr/seven/ms,   'task 7 listed');
-like ($output, qr/eight/ms,   'task 8 listed');
-like ($output, qr/nine/ms,    'task 9 listed');
+my $output = qx{../src/task rc:$rc foo 2>&1};
+like ($output, qr/one/ms,     "$ut: task 1 listed");
+like ($output, qr/two/ms,     "$ut: task 2 listed");
+like ($output, qr/three/ms,   "$ut: task 3 listed");
+like ($output, qr/four/ms,    "$ut: task 4 listed");
+like ($output, qr/five/ms,    "$ut: task 5 listed");
+like ($output, qr/six/ms,     "$ut: task 6 listed");
+like ($output, qr/seven/ms,   "$ut: task 7 listed");
+like ($output, qr/eight/ms,   "$ut: task 8 listed");
+like ($output, qr/nine/ms,    "$ut: task 9 listed");
 
-$output = qx{../src/task rc:bug.rc foo due.before:7/2/2010 2>&1};
-like ($output, qr/one/ms,     'task 1 listed');
-like ($output, qr/two/ms,     'task 2 listed');
-like ($output, qr/three/ms,   'task 3 listed');
-like ($output, qr/four/ms,    'task 4 listed');
-unlike ($output, qr/five/ms,  'task 5 not listed');
-unlike ($output, qr/six/ms,   'task 6 not listed');
-unlike ($output, qr/seven/ms, 'task 7 not listed');
-unlike ($output, qr/eight/ms, 'task 8 not listed');
-unlike ($output, qr/nine/ms,  'task 9 not listed');
+$output = qx{../src/task rc:$rc foo due.before:7/2/2010 2>&1};
+like ($output, qr/one/ms,     "$ut: task 1 listed");
+like ($output, qr/two/ms,     "$ut: task 2 listed");
+like ($output, qr/three/ms,   "$ut: task 3 listed");
+like ($output, qr/four/ms,    "$ut: task 4 listed");
+unlike ($output, qr/five/ms,  "$ut: task 5 not listed");
+unlike ($output, qr/six/ms,   "$ut: task 6 not listed");
+unlike ($output, qr/seven/ms, "$ut: task 7 not listed");
+unlike ($output, qr/eight/ms, "$ut: task 8 not listed");
+unlike ($output, qr/nine/ms,  "$ut: task 9 not listed");
 
 # Cleanup.
-unlink qw(pending.data completed.data undo.data backlog.data bug.rc);
+unlink qw(pending.data completed.data undo.data backlog.data), $rc;
 exit 0;