diff --git a/test/uuid.t b/test/uuid.t
index 872b3ffac..8788920dd 100755
--- a/test/uuid.t
+++ b/test/uuid.t
@@ -27,21 +27,25 @@
 
 use strict;
 use warnings;
-use Test::More tests => 24;
+use Test::More tests => 22;
 
 # Ensure environment has no influence.
 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, '>', 'uuid.rc')
+if (open my $fh, '>', $rc)
 {
   print $fh "data.location=.\n",
             "dateformat=m/d/Y\n",
-            "confirmation=off\n",
             "report.unittest.columns=id,entry,start,description\n",
             "report.unittest.filter=status:pending\n",
-            "report.unittest.sort=id\n";
+            "report.unittest.sort=id\n",
+            "confirmation=off\n";
   close $fh;
 }
 
@@ -54,7 +58,6 @@ if (open my $fh, '>', 'pending.data')
 [description:"ssttaarrtt" entry:"1315335826" start:"1315338535" status:"pending" uuid:"d71d3566-7a6b-4c32-8f0b-6de75bb9397b"]
 EOF
   close $fh;
-  ok (-r 'pending.data', 'Created pending.data');
 }
 
 if (open my $fh, '>', 'completed.data')
@@ -66,12 +69,11 @@ if (open my $fh, '>', 'completed.data')
 [description:"UUNNDDOO" end:"1315338626" entry:"1315338626" status:"completed" uuid:"c1361003-948e-43e8-85c8-15d28dc3c71c"]
 EOF
   close $fh;
-  ok (-r 'pending.data', 'Created completed.data');
 }
 
-qx{../src/task rc:uuid.rc 9deed7ca-843d-4259-b2c4-40ce73e8e4f3 modify ONE 2>&1};
-qx{../src/task rc:uuid.rc 2 modify TWO 2>&1};
-my $output = qx{../src/task rc:uuid.rc list 2>&1};
+qx{../src/task rc:$rc 9deed7ca-843d-4259-b2c4-40ce73e8e4f3 modify ONE 2>&1};
+qx{../src/task rc:$rc 2 modify TWO 2>&1};
+my $output = qx{../src/task rc:$rc list 2>&1};
 like ($output, qr/ONE/, 'task list ONE');
 like ($output, qr/TWO/, 'task list TWO');
 like ($output, qr/three/, 'task list three');
@@ -81,8 +83,8 @@ unlike ($output, qr/five/, 'task does not list five');
 unlike ($output, qr/eenndd/, 'task does not list eenndd');
 unlike ($output, qr/UUNNDDOO/, 'task does not list UUNNDDOO');
 
-qx{../src/task rc:uuid.rc ea3b4822-574c-464b-8025-7f7be9f3cc57 modify FOUR 2>&1};
-$output = qx{../src/task rc:uuid.rc completed 2>&1};
+qx{../src/task rc:$rc ea3b4822-574c-464b-8025-7f7be9f3cc57 modify FOUR 2>&1};
+$output = qx{../src/task rc:$rc completed 2>&1};
 unlike ($output, qr/ONE/, 'task does not list ONE');
 unlike ($output, qr/TWO/, 'task does not list TWO');
 unlike ($output, qr/three/, 'task does not list three');
@@ -92,27 +94,27 @@ like ($output, qr/five/, 'did not modify task five');
 like ($output, qr/eenndd/, 'did not modify task eenndd');
 like ($output, qr/UUNNDDOO/, 'did not modify task UUNNDDOO');
 
-qx{../src/task rc:uuid.rc c1361003-948e-43e8-85c8-15d28dc3c71c modify status:pending 2>&1};
-$output = qx{../src/task rc:uuid.rc list 2>&1};
+qx{../src/task rc:$rc c1361003-948e-43e8-85c8-15d28dc3c71c modify status:pending 2>&1};
+$output = qx{../src/task rc:$rc list 2>&1};
 like ($output, qr/UUNNDDOO/, 'task UUNNDDOO modified status to pending');
-$output = qx{../src/task rc:uuid.rc completed 2>&1};
+$output = qx{../src/task rc:$rc completed 2>&1};
 unlike ($output, qr/UUNNDDOO/, 'task does not list UUNNDDOO after modification');
 
-qx{../src/task rc:uuid.rc d71d3566-7a6b-4c32-8f0b-6de75bb9397b modify start:12/31/2010 2>&1};
-$output = qx{../src/task rc:uuid.rc unittest 2>&1};
+qx{../src/task rc:$rc d71d3566-7a6b-4c32-8f0b-6de75bb9397b modify start:12/31/2010 2>&1};
+$output = qx{../src/task rc:$rc unittest 2>&1};
 like ($output, qr/12\/31\/2010/, 'modified start date of task ssttaarrtt');
 
-qx{../src/task rc:uuid.rc 727baa6c-65b8-485e-a810-e133e3cd83dc modify end:12/31/2010 2>&1};
-$output = qx{../src/task rc:uuid.rc completed 2>&1};
+qx{../src/task rc:$rc 727baa6c-65b8-485e-a810-e133e3cd83dc modify end:12/31/2010 2>&1};
+$output = qx{../src/task rc:$rc completed 2>&1};
 like ($output, qr/12\/31\/2010/, 'modified end date of task eenndd');
 
-qx{../src/task rc:uuid.rc aa4abef1-1dc5-4a43-b6a0-7872df3094bb modify entry:12/30/2010 2>&1};
-qx{../src/task rc:uuid.rc aa4abef1-1dc5-4a43-b6a0-7872df3094bb modify start:1/1/2011 2>&1};
-$output = qx{../src/task rc:uuid.rc unittest 2>&1};
+qx{../src/task rc:$rc aa4abef1-1dc5-4a43-b6a0-7872df3094bb modify entry:12/30/2010 2>&1};
+qx{../src/task rc:$rc aa4abef1-1dc5-4a43-b6a0-7872df3094bb modify start:1/1/2011 2>&1};
+$output = qx{../src/task rc:$rc unittest 2>&1};
 like ($output, qr/12\/30\/2010/, 'modified entry date of task three');
 like ($output, qr/1\/1\/2011/, 'added start date of task three with modify');
 
 # Cleanup.
-unlink qw(pending.data completed.data undo.data backlog.data uuid.rc);
+unlink qw(pending.data completed.data undo.data backlog.data), $rc;
 exit 0;