--- Test-Mojibake-0.3/t/06-pp-vs-xs.t
+++ Test-Mojibake-0.3/t/06-pp-vs-xs.t
@@ -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 @@
 
 unless ($Test::Mojibake::use_xs) {
     diag('No XS module detected, will fallback to PP implementation!');
-    done_testing(2);
     exit;
 }
 
@@ -33,8 +32,6 @@
 
 diag(sprintf('XS/PP speed ratio is %0.2f', $t0->iters / $t1->iters));
 
-done_testing(7);
-
 sub run {
     my $i = 0;
     for (@buf) {
--- Test-Mojibake-0.3/t/release-cpan-changes.t
+++ Test-Mojibake-0.3/t/release-cpan-changes.t
@@ -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();