diff -up namespace-clean-0.22/t/07-debugger.t.orig namespace-clean-0.22/t/07-debugger.t
--- namespace-clean-0.22/t/07-debugger.t.orig	2011-12-21 09:50:20.000000000 +0000
+++ namespace-clean-0.22/t/07-debugger.t	2011-12-27 12:15:04.039679744 +0000
@@ -17,6 +17,8 @@ BEGIN {
 
 }
 
+plan tests => 4;
+
 {
     package Foo;
 
@@ -35,5 +37,3 @@ ok( !Foo->can("foo"), "foo cleaned up" )
 ok( !Foo->can("baz"), "baz cleaned up" );
 
 Foo->bar();
-
-done_testing;
diff -up namespace-clean-0.22/t/08-const-sub.t.orig namespace-clean-0.22/t/08-const-sub.t
--- namespace-clean-0.22/t/08-const-sub.t.orig	2011-03-29 22:44:20.000000000 +0100
+++ namespace-clean-0.22/t/08-const-sub.t	2011-12-27 12:15:04.052679751 +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 namespace-clean-0.22/t/09-fiddle-hinthash.t.orig namespace-clean-0.22/t/09-fiddle-hinthash.t
--- namespace-clean-0.22/t/09-fiddle-hinthash.t.orig	2011-12-22 11:07:06.000000000 +0000
+++ namespace-clean-0.22/t/09-fiddle-hinthash.t	2011-12-27 12:15:43.780700500 +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 namespace-clean-0.22/t/10-pure-perl.t.orig namespace-clean-0.22/t/10-pure-perl.t
--- namespace-clean-0.22/t/10-pure-perl.t.orig	2011-12-22 11:20:21.000000000 +0000
+++ namespace-clean-0.22/t/10-pure-perl.t	2011-12-27 12:16:46.394733202 +0000
@@ -8,6 +8,8 @@ plan skip_all => "PP tests already execu
 eval { require B::Hooks::EndOfScope }
   or plan skip_all => "PP tests already executed";
 
+plan tests => 11;
+
 # the PP tests will run either wih D::H (mainly on smokers)
 # or by setting the envvar (for users)
 my $has_d_h = eval { require Devel::Hide };
@@ -45,5 +47,3 @@ for my $fn (glob("$Bin/*.t")) {
   wait;
   ok (! $?, "Exit $? from: @cmd");
 }
-
-done_testing;