diff -up Test-Mojibake-0.4/t/06-pp-vs-xs.t.orig Test-Mojibake-0.4/t/06-pp-vs-xs.t
--- Test-Mojibake-0.4/t/06-pp-vs-xs.t.orig	2012-06-25 20:36:58.000000000 +0100
+++ Test-Mojibake-0.4/t/06-pp-vs-xs.t	2012-06-26 13:01:09.341933492 +0100
@@ -1,7 +1,7 @@
 #!perl -T
 use strict;
 
-use Test::More;
+use Test::More 'no_plan';
 
 BEGIN {
     use_ok('Benchmark', 'countit');
@@ -10,7 +10,6 @@ BEGIN {
 
 unless ($Test::Mojibake::use_xs) {
     diag('No XS module detected, will fallback to PP implementation!');
-    done_testing(2);
     exit;
 }
 
@@ -33,8 +32,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.4/t/07-broken-utf8.t.orig Test-Mojibake-0.4/t/07-broken-utf8.t
--- Test-Mojibake-0.4/t/07-broken-utf8.t.orig	2012-06-25 20:36:58.000000000 +0100
+++ Test-Mojibake-0.4/t/07-broken-utf8.t	2012-06-26 13:01:09.356933495 +0100
@@ -24,7 +24,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.4/t/release-cpan-changes.t.orig Test-Mojibake-0.4/t/release-cpan-changes.t
--- Test-Mojibake-0.4/t/release-cpan-changes.t.orig	2012-06-25 20:36:58.000000000 +0100
+++ Test-Mojibake-0.4/t/release-cpan-changes.t	2012-06-26 13:01:09.356933495 +0100
@@ -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.4/t/release-test-version.t.orig Test-Mojibake-0.4/t/release-test-version.t
--- Test-Mojibake-0.4/t/release-test-version.t.orig	2012-06-26 13:01:09.000000000 +0100
+++ Test-Mojibake-0.4/t/release-test-version.t	2012-06-26 13:01:53.073948449 +0100
@@ -27,4 +27,3 @@ push @imports, $params
 Test::Version->import(@imports);
 
 version_all_ok();
-done_testing;