--- t/000-report-versions-tiny.t
+++ t/000-report-versions-tiny.t
@@ -1,12 +1,8 @@
 use strict;
 use warnings;
-use Test::More 0.88;
-# This is a relatively nice way to avoid Test::NoWarnings breaking our
-# expectations by adding extra tests, without using no_plan.  It also helps
-# avoid any other test module that feels introducing random tests, or even
-# test plans, is a nice idea.
+use Test::More tests => 1;
 our $success = 0;
-END { $success && done_testing; }
+END { $success; }
 
 # List our own version used to generate this
 my $v = "\nGenerated by Dist::Zilla::Plugin::ReportVersions::Tiny v1.10\n";
--- t/custom.t
+++ t/custom.t
@@ -2,7 +2,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More tests => 8;
 
 use Software::License::Custom;
 
@@ -40,5 +40,3 @@ Well... this is only some sample text. I
 
 Yes, spanning more lines and more paragraphs.
 END_OF_FULLTEXT
-
-done_testing;
--- t/guess_meta_license.t
+++ t/guess_meta_license.t
@@ -64,4 +64,3 @@ is_deeply(
   [ ],
 );
 
-done_testing;
--- t/meta-names.t
+++ t/meta-names.t
@@ -2,13 +2,16 @@
 use strict;
 use warnings;
 
-use Test::More 0.88;
+use Test::More;
 
 my @files = <lib/Software/License/*.pm>;
 
+plan tests => scalar @files;
+
 for my $module (@files) {
   # It's retired.  Dunno if it's okay to be open_source.  Punt!
-  next if $module =~ /Sun.pm$/;
+  SKIP: {
+  skip "Dunno if it's okay for Sun.pm to be open_source", 1 if $module =~ /Sun.pm$/;
 
   my $pkg = $module;
   $pkg =~ s{^lib/}{};
@@ -18,6 +21,5 @@ for my $module (@files) {
   eval "require $pkg; 1";
 
   ok(defined $pkg->meta_name, "$pkg provide meta_name");
+  }
 }
-
-done_testing;
--- xt/release/changes_has_content.t
+++ xt/release/changes_has_content.t
@@ -2,7 +2,7 @@
 
 use Test::More tests => 2;
 
-note 'Checking Changes';
+diag 'Checking Changes';
 my $changes_file = 'Changes';
 my $newver = '0.103010';
 my $trial_token = '-TRIAL';
@@ -14,8 +14,6 @@ SKIP: {
     ok(_get_changes($newver), "$changes_file has content for $newver");
 }
 
-done_testing;
-
 # _get_changes copied and adapted from Dist::Zilla::Plugin::Git::Commit
 # by Jerome Quelin
 sub _get_changes