--- t/000-report-versions-tiny.t
+++ t/000-report-versions-tiny.t
@@ -1,12 +1,6 @@
 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.
-our $success = 0;
-END { $success && done_testing; }
+use Test::More 0.47 tests => 1;
 
 # List our own version used to generate this
 my $v = "\nGenerated by Dist::Zilla::Plugin::ReportVersions::Tiny v1.08\n";
@@ -53,7 +47,7 @@ eval { $v .= pmver('File::Find','any ver
 eval { $v .= pmver('File::Temp','any version') };
 eval { $v .= pmver('MRO::Compat','0.09') };
 eval { $v .= pmver('Sub::Exporter','0.979') };
-eval { $v .= pmver('Test::More','0.96') };
+eval { $v .= pmver('Test::More','0.47') };
 eval { $v .= pmver('Test::Pod','1.41') };
 eval { $v .= pmver('base','any version') };
 eval { $v .= pmver('lib','any version') };
@@ -73,7 +67,6 @@ EOT
 
 diag($v);
 ok(1, "we really didn't test anything, just reporting data");
-$success = 1;
 
 # Work around another nasty module on CPAN. :/
 no warnings 'once';
--- t/basic.t
+++ t/basic.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 use lib 't/lib';
-use Test::More;
+use Test::More tests => 36;
 
 use Parent;
 use Child;
@@ -168,5 +168,3 @@ is_deeply(
   { n => \"foo$crlf" },
   "windows newlines work",
 );
-
-done_testing;
--- xt/release/changes_has_content.t
+++ xt/release/changes_has_content.t
@@ -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