--- t/author-eol.t
+++ t/author-eol.t
@@ -11,7 +11,7 @@ use warnings;
 
 # this test was generated with Dist::Zilla::Plugin::Test::EOL 0.17
 
-use Test::More 0.88;
+use Test::More;
 use Test::EOL;
 
 my @files = (
@@ -33,5 +33,6 @@ my @files = (
     't/release-tidyall.t'
 );
 
+plan tests => scalar @files;
+
 eol_unix_ok($_, { trailing_whitespace => 1 }) foreach @files;
-done_testing;
--- t/author-no-tabs.t
+++ t/author-no-tabs.t
@@ -11,7 +11,7 @@ use warnings;
 
 # this test was generated with Dist::Zilla::Plugin::Test::NoTabs 0.13
 
-use Test::More 0.88;
+use Test::More;
 use Test::NoTabs;
 
 my @files = (
@@ -33,5 +33,6 @@ my @files = (
     't/release-tidyall.t'
 );
 
+plan tests => scalar @files;
+
 notabs_ok($_) foreach @files;
-done_testing;
--- t/basic.t
+++ t/basic.t
@@ -2,12 +2,14 @@ use strict;
 use warnings;
 
 use Test::Fatal;
-use Test::More 0.88;
+use Test::More;
 
 use Test::Requires {
     'Test::Output' => '0.16',
 };
 
+plan tests => 25;
+
 {
     ## no critic (BuiltinFunctions::ProhibitStringyEval, ErrorHandling::RequireCheckingReturnValueOfEval)
     like(
@@ -272,4 +274,3 @@ use Test::Requires {
     );
 }
 
-done_testing();
--- t/release-cpan-changes.t
+++ t/release-cpan-changes.t
@@ -1,19 +1,16 @@
 #!perl
 
+use Test::More;
+
 BEGIN {
-  unless ($ENV{RELEASE_TESTING}) {
-    require Test::More;
-    Test::More::plan(skip_all => 'these tests are for release candidate testing');
-  }
+    plan skip_all => 'these tests are for release candidate testing' unless ($ENV{RELEASE_TESTING});
+    eval 'use Test::CPAN::Changes';
+    plan skip_all => 'Test::CPAN::Changes required for this test' if $@;
 }
 
 
 use strict;
 use warnings;
 
-use Test::More 0.96 tests => 2;
-use_ok('Test::CPAN::Changes');
-subtest 'changes_ok' => sub {
-    changes_file_ok('Changes');
-};
-done_testing();
+plan tests => 4;
+changes_file_ok('Changes');
--- t/release-pod-coverage.t
+++ t/release-pod-coverage.t
@@ -10,7 +10,7 @@ BEGIN {
 # This file was automatically generated by Dist::Zilla::Plugin::Test::Pod::Coverage::Configurable.
 
 use Test::Pod::Coverage 1.08;
-use Test::More 0.88;
+use Test::More;
 
 BEGIN {
     if ( $] <= 5.008008 ) {
@@ -49,4 +49,3 @@ for my $module ( sort @modules ) {
     );
 }
 
-done_testing();
--- t/release-test-version.t
+++ t/release-test-version.t
@@ -26,5 +26,6 @@ push @imports, $params
 
 Test::Version->import(@imports);
 
-version_all_ok;
-done_testing;
+plan tests => 3;
+
+version_all_ok();
--- t/release-tidyall.t
+++ t/release-tidyall.t
@@ -9,7 +9,7 @@ BEGIN {
 
 # This file was automatically generated by Dist::Zilla::Plugin::Test::TidyAll
 
-use Test::More 0.88;
+use Test::More;
 
 eval 'use Test::Code::TidyAll 0.24;';
 plan skip_all => 'Test::Code::TidyAll 0.24 required for testing tidiness'
@@ -17,4 +17,3 @@ plan skip_all => 'Test::Code::TidyAll 0.
 
 tidyall_ok();
 
-done_testing();