diff -up Test-Mojibake-0.8/t/06-pp-vs-xs.t.orig Test-Mojibake-0.8/t/06-pp-vs-xs.t
--- Test-Mojibake-0.8/t/06-pp-vs-xs.t.orig	2013-01-26 20:28:12.000000000 +0000
+++ Test-Mojibake-0.8/t/06-pp-vs-xs.t	2013-01-26 22:17:47.038813730 +0000
@@ -2,7 +2,7 @@
 use strict;
 use warnings qw(all);
 
-use Test::More;
+use Test::More 'no_plan';
 
 ## no critic (ProhibitPackageVars, ProtectPrivateSubs)
 
@@ -13,7 +13,6 @@ BEGIN {
 
 unless ($Test::Mojibake::use_xs) {
     diag('No XS module detected, will fallback to PP implementation!');
-    done_testing(2);
     exit;
 }
 
@@ -36,8 +35,6 @@ ok($t0->iters > $t1->iters, 'XS faster t
 
 diag(sprintf('XS/PP speed ratio is %0.2f', $t0->iters / $t1->iters));
 
-done_testing(7);
-
 sub run {
     my $i = 0;
     for (@buf) {
diff -up Test-Mojibake-0.8/t/07-broken-utf8.t.orig Test-Mojibake-0.8/t/07-broken-utf8.t
--- Test-Mojibake-0.8/t/07-broken-utf8.t.orig	2013-01-26 20:28:12.000000000 +0000
+++ Test-Mojibake-0.8/t/07-broken-utf8.t	2013-01-26 22:17:47.038813730 +0000
@@ -27,7 +27,7 @@ my @tests = (
     ["11-overlong-5"    => 0 => \"\xfc\x80\x80\x80\x80\xaf"],
 );
 
+plan tests => scalar @tests;
+
 ok(Test::Mojibake::_detect_utf8($_->[2]) == $_->[1], $_->[0])
     for @tests;
-
-done_testing(scalar @tests);
diff -up Test-Mojibake-0.8/t/release-cpan-changes.t.orig Test-Mojibake-0.8/t/release-cpan-changes.t
--- Test-Mojibake-0.8/t/release-cpan-changes.t.orig	2013-01-26 20:28:12.000000000 +0000
+++ Test-Mojibake-0.8/t/release-cpan-changes.t	2013-01-26 22:17:47.038813730 +0000
@@ -1,15 +1,11 @@
 #!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 Test::More;
-eval 'use Test::CPAN::Changes';
-plan skip_all => 'Test::CPAN::Changes required for this test' if $@;
 changes_ok();
-done_testing();
diff -up Test-Mojibake-0.8/t/release-test-version.t.orig Test-Mojibake-0.8/t/release-test-version.t
--- Test-Mojibake-0.8/t/release-test-version.t.orig	2013-01-26 22:17:47.000000000 +0000
+++ Test-Mojibake-0.8/t/release-test-version.t	2013-01-26 22:18:26.069722569 +0000
@@ -26,5 +26,6 @@ push @imports, $params
 
 Test::Version->import(@imports);
 
+plan tests => 2;
+
 version_all_ok();
-done_testing;