diff --git a/test/bug.414.t b/test/bug.414.t
index 5361546a6..3d3949509 100755
--- a/test/bug.414.t
+++ b/test/bug.414.t
@@ -27,7 +27,7 @@
 
 use strict;
 use warnings;
-use Test::More tests => 7;
+use Test::More tests => 5;
 
 # Ensure environment has no influence.
 delete $ENV{'TASKDATA'};
@@ -38,7 +38,6 @@ if (open my $fh, '>', 'bug.rc')
 {
   print $fh "data.location=.\n";
   close $fh;
-  ok (-r 'bug.rc', 'Created bug.rc');
 }
 
 # Bug #414: Tags filtering not working with unicode characters
@@ -62,11 +61,5 @@ unlike ($output, qr/two/, 'not found UTF8 tag föo');
 
 # Cleanup.
 unlink qw(pending.data completed.data undo.data backlog.data bug.rc);
-ok (! -r 'pending.data'   &&
-    ! -r 'completed.data' &&
-    ! -r 'undo.data'      &&
-    ! -r 'backlog.data'   &&
-    ! -r 'bug.rc', 'Cleanup');
-
 exit 0;
 
diff --git a/test/bug.417.t b/test/bug.417.t
index 88802569d..e914e5d09 100755
--- a/test/bug.417.t
+++ b/test/bug.417.t
@@ -27,7 +27,7 @@
 
 use strict;
 use warnings;
-use Test::More tests => 4;
+use Test::More tests => 2;
 
 # Ensure environment has no influence.
 delete $ENV{'TASKDATA'};
@@ -39,7 +39,6 @@ if (open my $fh, '>', 'bug.rc')
   print $fh "data.location=.\n",
             "defaultwidth=100\n";
   close $fh;
-  ok (-r 'bug.rc', 'Created bug.rc');
 }
 
 # Bug #417: Sorting by countdown_compact not working
@@ -55,11 +54,5 @@ like ($output, qr/after.+now.+before/ms, 'rc.report.long.sort:due- works');
 
 # Cleanup.
 unlink qw(pending.data completed.data undo.data backlog.data bug.rc);
-ok (! -r 'pending.data'   &&
-    ! -r 'completed.data' &&
-    ! -r 'undo.data'      &&
-    ! -r 'backlog.data'   &&
-    ! -r 'bug.rc', 'Cleanup');
-
 exit 0;
 
diff --git a/test/bug.418.t b/test/bug.418.t
index 3b3c0132f..001f60fe8 100755
--- a/test/bug.418.t
+++ b/test/bug.418.t
@@ -27,7 +27,7 @@
 
 use strict;
 use warnings;
-use Test::More tests => 20;
+use Test::More tests => 18;
 
 # Ensure environment has no influence.
 delete $ENV{'TASKDATA'};
@@ -45,7 +45,6 @@ if (open my $fh, '>', 'bug.rc')
             "report.foo.filter=status:pending\n",
             "report.foo.dateformat=MD\n";
   close $fh;
-  ok (-r 'bug.rc', 'Created bug.rc');
 }
 
 # Bug #418: due.before:eow not working
@@ -84,11 +83,5 @@ unlike ($output, qr/nine/ms,  'task 9 not listed');
 
 # Cleanup.
 unlink qw(pending.data completed.data undo.data backlog.data bug.rc);
-ok (! -r 'pending.data'   &&
-    ! -r 'completed.data' &&
-    ! -r 'undo.data'      &&
-    ! -r 'backlog.data'   &&
-    ! -r 'bug.rc', 'Cleanup');
-
 exit 0;
 
diff --git a/test/bug.425.t b/test/bug.425.t
index e5ae8d0fe..4569dfcef 100755
--- a/test/bug.425.t
+++ b/test/bug.425.t
@@ -27,7 +27,7 @@
 
 use strict;
 use warnings;
-use Test::More tests => 3;
+use Test::More tests => 1;
 
 # Ensure environment has no influence.
 delete $ENV{'TASKDATA'};
@@ -40,7 +40,6 @@ if (open my $fh, '>', '425.rc')
             "confirmation=off\n";
 
   close $fh;
-  ok (-r '425.rc', 'Created 425.rc');
 }
 
 # Bug #425: Parser preventing editing of an existing task depending on description
@@ -56,10 +55,4 @@ like ($output, qr/1\s+Bar in Bar/m, 'parser - interpret \'in\' in description');
 
 # Cleanup.
 unlink qw(pending.data completed.data undo.data backlog.data 425.rc);
-ok (! -r 'pending.data'   &&
-    ! -r 'completed.data' &&
-    ! -r 'undo.data'      &&
-    ! -r 'backlog.data'   &&
-    ! -r '425.rc', 'Cleanup');
-
 exit 0;
diff --git a/test/bug.434.t b/test/bug.434.t
index 013e599d6..59d40c855 100755
--- a/test/bug.434.t
+++ b/test/bug.434.t
@@ -27,7 +27,7 @@
 
 use strict;
 use warnings;
-use Test::More tests => 3;
+use Test::More tests => 1;
 
 # Ensure environment has no influence.
 delete $ENV{'TASKDATA'};
@@ -39,7 +39,6 @@ if (open my $fh, '>', 'bug.rc')
   print $fh "data.location=.\n",
             "confirmation=off\n";
   close $fh;
-  ok (-r 'bug.rc', 'Created bug.rc');
 }
 
 # Bug #434: Task shouldn't prevent users from marking as done tasks with status:waiting
@@ -51,11 +50,5 @@ like ($output, qr/Completed 1 task\./, 'Waiting task marked completed');
 
 # Cleanup.
 unlink qw(pending.data completed.data undo.data backlog.data bug.rc);
-ok (! -r 'pending.data'   &&
-    ! -r 'completed.data' &&
-    ! -r 'undo.data'      &&
-    ! -r 'backlog.data'   &&
-    ! -r 'bug.rc', 'Cleanup');
-
 exit 0;
 
diff --git a/test/bug.438.t b/test/bug.438.t
index 8b7999bb5..541ed39ca 100755
--- a/test/bug.438.t
+++ b/test/bug.438.t
@@ -27,7 +27,7 @@
 
 use strict;
 use warnings;
-use Test::More tests => 8;
+use Test::More tests => 6;
 
 # Ensure environment has no influence.
 delete $ENV{'TASKDATA'};
@@ -42,7 +42,6 @@ if (open my $fh, '>', 'bug.rc')
             "report.foo.dateformat=SNHDMY\n",
             "confirmation=off\n";
   close $fh;
-  ok (-r 'bug.rc', 'Created bug.rc');
 }
 
 # Bug #438: Reports sorting by end, start, and entry are ordered incorrectly, if
@@ -86,11 +85,5 @@ like ($output, qr/newer.+older/ms, 'sort:end- -> newer older');
 
 # Cleanup.
 unlink qw(pending.data completed.data undo.data backlog.data bug.rc);
-ok (! -r 'pending.data'   &&
-    ! -r 'completed.data' &&
-    ! -r 'undo.data'      &&
-    ! -r 'backlog.data'   &&
-    ! -r 'bug.rc', 'Cleanup');
-
 exit 0;
 
diff --git a/test/bug.440.t b/test/bug.440.t
index 8ab1fbc6c..0920512e8 100755
--- a/test/bug.440.t
+++ b/test/bug.440.t
@@ -27,7 +27,7 @@
 
 use strict;
 use warnings;
-use Test::More tests => 6;
+use Test::More tests => 4;
 
 # Ensure environment has no influence.
 delete $ENV{'TASKDATA'};
@@ -40,7 +40,6 @@ if (open my $fh, '>', '440.rc')
             "confirmation=off\n";
 
   close $fh;
-  ok (-r '440.rc', 'Created 440.rc');
 }
 
 # Bug #440: Parser recognizes an attempt to simultaneously subst and append, but doesn't do it
@@ -64,10 +63,4 @@ like ($output2, qr/\w+ Appendtext/, 'simultaneous append and subst - append');
 
 # Cleanup.
 unlink qw(pending.data completed.data undo.data backlog.data 440.rc);
-ok (! -r 'pending.data'   &&
-    ! -r 'completed.data' &&
-    ! -r 'undo.data'      &&
-    ! -r 'backlog.data'   &&
-    ! -r '440.rc', 'Cleanup');
-
 exit 0;
diff --git a/test/bug.441.t b/test/bug.441.t
index d2e63f4e1..a06dd7087 100755
--- a/test/bug.441.t
+++ b/test/bug.441.t
@@ -27,7 +27,7 @@
 
 use strict;
 use warnings;
-use Test::More tests => 3;
+use Test::More tests => 1;
 
 # Ensure environment has no influence.
 delete $ENV{'TASKDATA'};
@@ -40,7 +40,6 @@ if (open my $fh, '>', '441.rc')
             "confirmation=off\n";
 
   close $fh;
-  ok (-r '441.rc', 'Created 441.rc');
 }
 
 # Bug #441: A colon messes up text replacement with ///
@@ -51,10 +50,4 @@ like ($output, qr/one two: three/ms, 'Substitution with colon worked');
 
 # Cleanup.
 unlink qw(pending.data completed.data undo.data backlog.data 441.rc);
-ok (! -r 'pending.data'   &&
-    ! -r 'completed.data' &&
-    ! -r 'undo.data'      &&
-    ! -r 'backlog.data'   &&
-    ! -r '441.rc', 'Cleanup');
-
 exit 0;
diff --git a/test/bug.455.t b/test/bug.455.t
index 74382882f..9b0e6be2a 100755
--- a/test/bug.455.t
+++ b/test/bug.455.t
@@ -27,7 +27,7 @@
 
 use strict;
 use warnings;
-use Test::More tests => 4;
+use Test::More tests => 2;
 
 # Ensure environment has no influence.
 delete $ENV{'TASKDATA'};
@@ -40,7 +40,6 @@ if (open my $fh, '>', '455.rc')
   print $fh "print.empty.columns=no\n";
 
   close $fh;
-  ok (-r '455.rc', 'Created 455.rc');
 }
 
 # Bug #455 - Text alignment in reports is broken when text contains wide utf8
@@ -57,10 +56,4 @@ like ($output, qr/\S\s{4}def/ms, 'bug 455 - correct spacing in non utf8 task');
 
 # Cleanup.
 unlink qw(pending.data completed.data undo.data backlog.data 455.rc);
-ok (! -r 'pending.data'   &&
-    ! -r 'completed.data' &&
-    ! -r 'undo.data'      &&
-    ! -r 'backlog.data'   &&
-    ! -r '455.rc', 'Cleanup');
-
 exit 0;
diff --git a/test/bug.480.t b/test/bug.480.t
index 6d3718766..9ff47be48 100755
--- a/test/bug.480.t
+++ b/test/bug.480.t
@@ -27,7 +27,7 @@
 
 use strict;
 use warnings;
-use Test::More tests => 40;
+use Test::More tests => 38;
 
 # Ensure environment has no influence.
 delete $ENV{'TASKDATA'};
@@ -41,7 +41,6 @@ if (open my $fh, '>', 'bug.rc')
             "confirmation=off\n";
 
   close $fh;
-  ok (-r 'bug.rc', 'Created bug.rc');
 }
 
 # Bug #480 - putting a '@' character in tags breaks filters.
@@ -130,10 +129,4 @@ unlike ($output, qr/three/, 'Triple: no @foo.3');
 
 # Cleanup.
 unlink qw(pending.data completed.data undo.data backlog.data bug.rc);
-ok (! -r 'pending.data'   &&
-    ! -r 'completed.data' &&
-    ! -r 'undo.data'      &&
-    ! -r 'backlog.data'   &&
-    ! -r 'bug.rc', 'Cleanup');
-
 exit 0;
diff --git a/test/bug.489.t b/test/bug.489.t
index 597267ce6..10019516d 100755
--- a/test/bug.489.t
+++ b/test/bug.489.t
@@ -27,7 +27,7 @@
 
 use strict;
 use warnings;
-use Test::More tests => 4;
+use Test::More tests => 2;
 
 # Ensure environment has no influence.
 delete $ENV{'TASKDATA'};
@@ -37,9 +37,7 @@ delete $ENV{'TASKRC'};
 if (open my $fh, '>', 'bug.rc')
 {
   print $fh "data.location=.\n";
-
   close $fh;
-  ok (-r 'bug.rc', 'Created bug.rc');
 }
 
 # Bug #489 - tags.none: is not filtering tagless tasks
@@ -51,10 +49,4 @@ like   ($output, qr/without/, 'tags.none: finds tagless');
 
 # Cleanup.
 unlink qw(pending.data completed.data undo.data backlog.data bug.rc);
-ok (! -r 'pending.data'   &&
-    ! -r 'completed.data' &&
-    ! -r 'undo.data'      &&
-    ! -r 'backlog.data'   &&
-    ! -r 'bug.rc', 'Cleanup');
-
 exit 0;
diff --git a/test/bug.495.t b/test/bug.495.t
index eef05148c..37fe74160 100755
--- a/test/bug.495.t
+++ b/test/bug.495.t
@@ -27,7 +27,7 @@
 
 use strict;
 use warnings;
-use Test::More tests => 3;
+use Test::More tests => 1;
 
 # Ensure environment has no influence.
 delete $ENV{'TASKDATA'};
@@ -40,7 +40,6 @@ if (open my $fh, '>', 'bug.rc')
             "confirmation=off\n";
 
   close $fh;
-  ok (-r 'bug.rc', 'Created bug.rc');
 }
 
 # Bug #495 - double hyphen mishandled for annotations.
@@ -51,10 +50,4 @@ like ($output, qr/This is -- a -- test/, 'Double hyphens preserved, except the f
 
 # Cleanup.
 unlink qw(pending.data completed.data undo.data backlog.data bug.rc);
-ok (! -r 'pending.data'   &&
-    ! -r 'completed.data' &&
-    ! -r 'undo.data'      &&
-    ! -r 'backlog.data'   &&
-    ! -r 'bug.rc', 'Cleanup');
-
 exit 0;
diff --git a/test/bug.555.t b/test/bug.555.t
index fcfb87c90..1eeb8cec8 100755
--- a/test/bug.555.t
+++ b/test/bug.555.t
@@ -27,7 +27,7 @@
 
 use strict;
 use warnings;
-use Test::More tests => 4;
+use Test::More tests => 2;
 
 # Ensure environment has no influence.
 delete $ENV{'TASKDATA'};
@@ -37,9 +37,7 @@ delete $ENV{'TASKRC'};
 if (open my $fh, '>', 'bug.rc')
 {
   print $fh "data.location=.\n";
-
   close $fh;
-  ok (-r 'bug.rc', 'Created bug.rc');
 }
 
 # Bug #555 - log with a project segfaults.
@@ -49,10 +47,4 @@ unlike ($output, qr/Segmentation fault/, 'no segfault from log with project');
 
 # Cleanup.
 unlink qw(pending.data completed.data undo.data backlog.data bug.rc);
-ok (! -r 'pending.data'   &&
-    ! -r 'completed.data' &&
-    ! -r 'undo.data'      &&
-    ! -r 'backlog.data'   &&
-    ! -r 'bug.rc', 'Cleanup');
-
 exit 0;