diff --git a/test/args.1.t b/test/args.1.t
index c0897bd0b..a3053b37f 100755
--- a/test/args.1.t
+++ b/test/args.1.t
@@ -28,7 +28,7 @@
 
 use strict;
 use warnings;
-use Test::More tests => 12;
+use Test::More tests => 7;
 
 # Create the rc file.
 if (open my $fh, '>', 'args.rc')
@@ -55,23 +55,13 @@ $output = qx{../src/task rc:args.rc done 2};
 unlike ($output, qr/^Completed 2 /ms, 'ID after COMMAND');
 
 # Cleanup.
-unlink 'pending.data';
-ok (!-r 'pending.data', 'Removed pending.data');
-
-unlink 'completed.data';
-ok (!-r 'completed.data', 'Removed completed.data');
-
-unlink 'undo.data';
-ok (!-r 'undo.data', 'Removed undo.data');
-
-unlink 'backlog.data';
-ok (!-r 'backlog.data', 'Removed backlog.data');
-
-unlink 'synch.key';
-ok (!-r 'synch.key', 'Removed synch.key');
-
-unlink 'args.rc';
-ok (!-r 'args.rc', 'Removed args.rc');
+unlink qw(pending.data completed.data undo.data backlog.data synch.key args.rc);
+ok (! -r 'pending.data'   &&
+    ! -r 'completed.data' &&
+    ! -r 'undo.data'      &&
+    ! -r 'backlog.data'   &&
+    ! -r 'synch_key.data' &&
+    ! -r 'args.rc', 'Cleanup');
 
 exit 0;
 
diff --git a/test/args.2.t b/test/args.2.t
index 75e742de9..ea54cbc0d 100755
--- a/test/args.2.t
+++ b/test/args.2.t
@@ -28,7 +28,7 @@
 
 use strict;
 use warnings;
-use Test::More tests => 12;
+use Test::More tests => 7;
 
 # Create the rc file.
 if (open my $fh, '>', 'args.rc')
@@ -67,23 +67,13 @@ $output = qx{../src/task rc:args.rc 5 info};
 like ($output, qr/Project\s+A/, 'done enpassant project');
 
 # Cleanup.
-unlink 'pending.data';
-ok (!-r 'pending.data', 'Removed pending.data');
-
-unlink 'completed.data';
-ok (!-r 'completed.data', 'Removed completed.data');
-
-unlink 'undo.data';
-ok (!-r 'undo.data', 'Removed undo.data');
-
-unlink 'backlog.data';
-ok (!-r 'backlog.data', 'Removed backlog.data');
-
-unlink 'synch.key';
-ok (!-r 'synch.key', 'Removed synch.key');
-
-unlink 'args.rc';
-ok (!-r 'args.rc', 'Removed args.rc');
+unlink qw(pending.data completed.data undo.data backlog.data synch.key args.rc);
+ok (! -r 'pending.data'   &&
+    ! -r 'completed.data' &&
+    ! -r 'undo.data'      &&
+    ! -r 'backlog.data'   &&
+    ! -r 'synch_key.data' &&
+    ! -r 'args.rc', 'Cleanup');
 
 exit 0;
 
diff --git a/test/args.3.t b/test/args.3.t
index 83f82c2f4..75fbe7368 100755
--- a/test/args.3.t
+++ b/test/args.3.t
@@ -28,7 +28,7 @@
 
 use strict;
 use warnings;
-use Test::More tests => 12;
+use Test::More tests => 7;
 
 # Create the rc file.
 if (open my $fh, '>', 'args.rc')
@@ -67,23 +67,13 @@ $output = qx{../src/task rc:args.rc 5 info};
 like ($output, qr/Project\s+A/, 'delete enpassant project');
 
 # Cleanup.
-unlink 'pending.data';
-ok (!-r 'pending.data', 'Removed pending.data');
-
-unlink 'completed.data';
-ok (!-r 'completed.data', 'Removed completed.data');
-
-unlink 'undo.data';
-ok (!-r 'undo.data', 'Removed undo.data');
-
-unlink 'backlog.data';
-ok (!-r 'backlog.data', 'Removed backlog.data');
-
-unlink 'synch.key';
-ok (!-r 'synch.key', 'Removed synch.key');
-
-unlink 'args.rc';
-ok (!-r 'args.rc', 'Removed args.rc');
+unlink qw(pending.data completed.data undo.data backlog.data synch.key args.rc);
+ok (! -r 'pending.data'   &&
+    ! -r 'completed.data' &&
+    ! -r 'undo.data'      &&
+    ! -r 'backlog.data'   &&
+    ! -r 'synch_key.data' &&
+    ! -r 'args.rc', 'Cleanup');
 
 exit 0;
 
diff --git a/test/args.4.t b/test/args.4.t
index 93448861b..2168f9f6d 100755
--- a/test/args.4.t
+++ b/test/args.4.t
@@ -28,7 +28,7 @@
 
 use strict;
 use warnings;
-use Test::More tests => 12;
+use Test::More tests => 7;
 
 # Create the rc file.
 if (open my $fh, '>', 'args.rc')
@@ -67,23 +67,13 @@ $output = qx{../src/task rc:args.rc 5 info};
 like ($output, qr/Project\s+A/, 'start enpassant project');
 
 # Cleanup.
-unlink 'pending.data';
-ok (!-r 'pending.data', 'Removed pending.data');
-
-unlink 'completed.data';
-ok (!-r 'completed.data', 'Removed completed.data');
-
-unlink 'undo.data';
-ok (!-r 'undo.data', 'Removed undo.data');
-
-unlink 'backlog.data';
-ok (!-r 'backlog.data', 'Removed backlog.data');
-
-unlink 'synch.key';
-ok (!-r 'synch.key', 'Removed synch.key');
-
-unlink 'args.rc';
-ok (!-r 'args.rc', 'Removed args.rc');
+unlink qw(pending.data completed.data undo.data backlog.data synch.key args.rc);
+ok (! -r 'pending.data'   &&
+    ! -r 'completed.data' &&
+    ! -r 'undo.data'      &&
+    ! -r 'backlog.data'   &&
+    ! -r 'synch_key.data' &&
+    ! -r 'args.rc', 'Cleanup');
 
 exit 0;
 
diff --git a/test/args.5.t b/test/args.5.t
index e65c39530..c3c568057 100755
--- a/test/args.5.t
+++ b/test/args.5.t
@@ -28,7 +28,7 @@
 
 use strict;
 use warnings;
-use Test::More tests => 12;
+use Test::More tests => 7;
 
 # Create the rc file.
 if (open my $fh, '>', 'args.rc')
@@ -73,23 +73,13 @@ $output = qx{../src/task rc:args.rc 5 info};
 like ($output, qr/Project\s+A/, 'stop enpassant project');
 
 # Cleanup.
-unlink 'pending.data';
-ok (!-r 'pending.data', 'Removed pending.data');
-
-unlink 'completed.data';
-ok (!-r 'completed.data', 'Removed completed.data');
-
-unlink 'undo.data';
-ok (!-r 'undo.data', 'Removed undo.data');
-
-unlink 'backlog.data';
-ok (!-r 'backlog.data', 'Removed backlog.data');
-
-unlink 'synch.key';
-ok (!-r 'synch.key', 'Removed synch.key');
-
-unlink 'args.rc';
-ok (!-r 'args.rc', 'Removed args.rc');
+unlink qw(pending.data completed.data undo.data backlog.data synch.key args.rc);
+ok (! -r 'pending.data'   &&
+    ! -r 'completed.data' &&
+    ! -r 'undo.data'      &&
+    ! -r 'backlog.data'   &&
+    ! -r 'synch_key.data' &&
+    ! -r 'args.rc', 'Cleanup');
 
 exit 0;
 
diff --git a/test/args.t b/test/args.t
index e9abb2a58..99d4e6ae9 100755
--- a/test/args.t
+++ b/test/args.t
@@ -28,7 +28,7 @@
 
 use strict;
 use warnings;
-use Test::More tests => 12;
+use Test::More tests => 7;
 
 # Create the rc file.
 if (open my $fh, '>', 'args.rc')
@@ -61,23 +61,13 @@ $output = qx{../src/task rc:args.rc info 1};
 like ($output, qr/Description\s+project:p\spri:H\s\+tag\sfoo\n/ms, 'task 1 modify -- project:p pri:H +tag foo');
 
 # Cleanup.
-unlink 'pending.data';
-ok (!-r 'pending.data', 'Removed pending.data');
-
-unlink 'completed.data';
-ok (!-r 'completed.data', 'Removed completed.data');
-
-unlink 'undo.data';
-ok (!-r 'undo.data', 'Removed undo.data');
-
-unlink 'backlog.data';
-ok (!-r 'backlog.data', 'Removed backlog.data');
-
-unlink 'synch.key';
-ok (!-r 'synch.key', 'Removed synch.key');
-
-unlink 'args.rc';
-ok (!-r 'args.rc', 'Removed args.rc');
+unlink qw(pending.data completed.data undo.data backlog.data synch.key args.rc);
+ok (! -r 'pending.data'   &&
+    ! -r 'completed.data' &&
+    ! -r 'undo.data'      &&
+    ! -r 'backlog.data'   &&
+    ! -r 'synch_key.data' &&
+    ! -r 'args.rc', 'Cleanup');
 
 exit 0;