diff -up ./t/07-debugger.t.orig ./t/07-debugger.t
--- ./t/07-debugger.t.orig	2012-11-26 18:47:12.000000000 +0000
+++ ./t/07-debugger.t	2012-12-05 15:16:36.658012218 +0000
@@ -26,6 +26,8 @@ BEGIN {
 
 }
 
+plan tests => 4;
+
 {
     package Foo;
 
@@ -44,5 +46,3 @@ ok( !Foo->can("foo"), "foo cleaned up" )
 ok( !Foo->can("baz"), "baz cleaned up" );
 
 Foo->bar();
-
-done_testing;
diff -up ./t/08-const-sub.t.orig ./t/08-const-sub.t
--- ./t/08-const-sub.t.orig	2011-03-29 22:44:20.000000000 +0100
+++ ./t/08-const-sub.t	2012-12-05 15:16:36.670012221 +0000
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More 0.88;
+use Test::More tests => 2;
 
 use constant CONST => 123;
 use namespace::clean;
@@ -10,5 +10,3 @@ my $x = CONST;
 is $x, 123;
 
 ok eval("!defined(&CONST)");
-
-done_testing;
diff -up ./t/09-fiddle-hinthash.t.orig ./t/09-fiddle-hinthash.t
--- ./t/09-fiddle-hinthash.t.orig	2011-12-22 11:07:06.000000000 +0000
+++ ./t/09-fiddle-hinthash.t	2012-12-05 15:16:36.671012222 +0000
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More 0.88;
+use Test::More tests => 4;
 
 {
   package Bar;
@@ -49,5 +49,3 @@ use Test::More 0.88;
   }
 }
 
-
-done_testing;
diff -up ./t/10-pure-perl.t.orig ./t/10-pure-perl.t
--- ./t/10-pure-perl.t.orig	2012-11-26 18:47:12.000000000 +0000
+++ ./t/10-pure-perl.t	2012-12-05 15:17:25.973028700 +0000
@@ -8,6 +8,8 @@ plan skip_all => "PP tests already execu
 eval { require Variable::Magic }
   or plan skip_all => "PP tests already executed";
 
+plan tests => 12;
+
 $ENV{B_HOOKS_ENDOFSCOPE_IMPLEMENTATION} = 'PP';
 require B::Hooks::EndOfScope;
 ok( ($INC{'B/Hooks/EndOfScope/PP.pm'} && ! $INC{'B/Hooks/EndOfScope/XS.pm'}),
@@ -42,5 +44,3 @@ for my $fn (bsd_glob("$Bin/*.t")) {
   wait;
   ok (! $?, "Exit $? from: @cmd");
 }
-
-done_testing;