diff -up Params-Validate-0.97/t/03-attribute.t.orig Params-Validate-0.97/t/03-attribute.t
--- Params-Validate-0.97/t/03-attribute.t.orig	2011-04-20 02:35:48.000000000 +0100
+++ Params-Validate-0.97/t/03-attribute.t	2011-04-20 10:30:33.390552059 +0100
@@ -5,7 +5,7 @@ use File::Spec;
 use lib File::Spec->catdir( 't', 'lib' );
 
 use PVTests;
-use Test::More;
+use Test::More tests => 10;
 
 use Attribute::Params::Validate;
 use Params::Validate qw(:all);
@@ -97,5 +97,3 @@ is(
     $@, q{},
     'Call quux'
 );
-
-done_testing();
diff -up Params-Validate-0.97/t/06-options.t.orig Params-Validate-0.97/t/06-options.t
--- Params-Validate-0.97/t/06-options.t.orig	2011-04-20 02:35:48.000000000 +0100
+++ Params-Validate-0.97/t/06-options.t	2011-04-20 11:06:13.313195523 +0100
@@ -5,7 +5,7 @@ use File::Spec;
 use lib File::Spec->catdir( 't', 'lib' );
 
 use PVTests;
-use Test::More;
+use Test::More tests => 4;
 
 use Params::Validate qw(:all);
 
@@ -35,5 +35,3 @@ eval { baz() };
 my $e = $@;
 is( $e->{hash}, 'ref' );
 ok( eval { $e->isa('Dead'); 1; } );
-
-done_testing();
diff -up Params-Validate-0.97/t/16-normalize.t.orig Params-Validate-0.97/t/16-normalize.t
--- Params-Validate-0.97/t/16-normalize.t.orig	2011-04-20 02:35:48.000000000 +0100
+++ Params-Validate-0.97/t/16-normalize.t	2011-04-20 11:13:38.328370113 +0100
@@ -2,7 +2,7 @@ use strict;
 use warnings;
 
 use Params::Validate qw(validate validate_with);
-use Test::More;
+use Test::More tests => 5;
 
 my $ucfirst_normalizer = sub { return ucfirst lc $_[0] };
 
@@ -67,5 +67,3 @@ like( $@, qr/normalize_keys.+a defined v
 
 eval { sub5( foo => 5, bar => 5 ) };
 like( $@, qr/normalize_keys.+already exists/ );
-
-done_testing();
diff -up Params-Validate-0.97/t/17-callbacks.t.orig Params-Validate-0.97/t/17-callbacks.t
--- Params-Validate-0.97/t/17-callbacks.t.orig	2011-04-20 02:35:48.000000000 +0100
+++ Params-Validate-0.97/t/17-callbacks.t	2011-04-20 11:03:10.947846460 +0100
@@ -2,7 +2,7 @@ use strict;
 use warnings;
 
 use Params::Validate qw(validate validate_pos SCALAR);
-use Test::More;
+use Test::More tests => 4;
 
 {
     my @p = ( foo => 1, bar => 2 );
@@ -74,5 +74,3 @@ use Test::More;
 
     is( $@, q{} );
 }
-
-done_testing();
diff -up Params-Validate-0.97/t/18-depends.t.orig Params-Validate-0.97/t/18-depends.t
--- Params-Validate-0.97/t/18-depends.t.orig	2011-04-20 02:35:48.000000000 +0100
+++ Params-Validate-0.97/t/18-depends.t	2011-04-20 10:58:37.826387297 +0100
@@ -2,7 +2,7 @@ use strict;
 use warnings;
 
 use Params::Validate qw(validate validate_pos);
-use Test::More;
+use Test::More tests => 19;
 
 {
     my %spec = (
@@ -157,5 +157,3 @@ use Test::More;
         "validate_pos() multiple depends (1.b): check error"
     );
 }
-
-done_testing();
diff -up Params-Validate-0.97/t/19-untaint.t.orig Params-Validate-0.97/t/19-untaint.t
--- Params-Validate-0.97/t/19-untaint.t.orig	2011-04-20 02:35:48.000000000 +0100
+++ Params-Validate-0.97/t/19-untaint.t	2011-04-20 10:57:58.514275685 +0100
@@ -10,6 +10,7 @@ eval "use Test::Taint 0.02";
 if ($@) {
     plan skip_all => 'These tests require Test::Taint 0.02+ to run';
 }
+plan tests => 9;
 
 taint_checking_ok('These tests are meaningless unless we are in taint mode.');
 
@@ -84,5 +85,3 @@ taint_checking_ok('These tests are meani
 
     tainted_ok( $new_value, 'value is still tainted after validation' );
 }
-
-done_testing();
diff -up Params-Validate-0.97/t/21-can.t.orig Params-Validate-0.97/t/21-can.t
--- Params-Validate-0.97/t/21-can.t.orig	2011-04-20 02:35:48.000000000 +0100
+++ Params-Validate-0.97/t/21-can.t	2011-04-20 10:59:32.743924904 +0100
@@ -2,7 +2,7 @@ use strict;
 use warnings;
 
 use Params::Validate qw(validate);
-use Test::More;
+use Test::More tests => 13;
 
 {
     my @p = ( foo => 'ClassCan' );
@@ -79,8 +79,6 @@ use Test::More;
     like( $@, qr/does not have the method: 'thingy'/, 'undef can' );
 }
 
-done_testing();
-
 package ClassCan;
 
 sub can {
diff -up Params-Validate-0.97/t/22-overload-can-bug.t.orig Params-Validate-0.97/t/22-overload-can-bug.t
--- Params-Validate-0.97/t/22-overload-can-bug.t.orig	2011-04-20 02:35:48.000000000 +0100
+++ Params-Validate-0.97/t/22-overload-can-bug.t	2011-04-20 10:59:00.599927735 +0100
@@ -2,7 +2,7 @@ use strict;
 use warnings;
 
 use Params::Validate qw(validate);
-use Test::More;
+use Test::More tests => 2;
 
 {
 
@@ -34,5 +34,3 @@ my $ovl = Overloaded->new;
 
     is( $@, q{}, 'overloaded object->foo' );
 }
-
-done_testing();
diff -up Params-Validate-0.97/t/23-readonly.t.orig Params-Validate-0.97/t/23-readonly.t
--- Params-Validate-0.97/t/23-readonly.t.orig	2011-04-20 02:35:48.000000000 +0100
+++ Params-Validate-0.97/t/23-readonly.t	2011-04-20 11:06:35.408630237 +0100
@@ -10,6 +10,7 @@ BEGIN {
         plan skip_all => 'Need Readonly::XS and Readonly for this test';
     }
     else {
+        plan tests => 2;
             }
 }
 
@@ -28,5 +29,3 @@ BEGIN {
     eval { validate_pos( @p, $spec ) };
     is( $@, q{}, 'validate_pos() call succeeded with Readonly spec hashref' );
 }
-
-done_testing();
diff -up Params-Validate-0.97/t/24-tied.t.orig Params-Validate-0.97/t/24-tied.t
--- Params-Validate-0.97/t/24-tied.t.orig	2011-04-20 02:35:48.000000000 +0100
+++ Params-Validate-0.97/t/24-tied.t	2011-04-20 10:26:27.427331608 +0100
@@ -2,7 +2,7 @@ use strict;
 use warnings;
 
 use Params::Validate qw(validate validate_pos SCALAR);
-use Test::More;
+use Test::More tests => 6;
 
 {
 
@@ -112,5 +112,3 @@ SKIP:
         'validate_pos() call succeeded with tied params array and tied hashref spec'
     );
 }
-
-done_testing();
diff -up Params-Validate-0.97/t/25-undef-regex.t.orig Params-Validate-0.97/t/25-undef-regex.t
--- Params-Validate-0.97/t/25-undef-regex.t.orig	2011-04-20 02:35:48.000000000 +0100
+++ Params-Validate-0.97/t/25-undef-regex.t	2011-04-20 11:17:12.956730782 +0100
@@ -2,7 +2,7 @@ use strict;
 use warnings;
 
 use Params::Validate qw(validate);
-use Test::More;
+use Test::More tests => 2;
 
 {
     my @w;
@@ -13,5 +13,3 @@ use Test::More;
     ok( $@,  'validation failed' );
     ok( !@w, 'no warnings' );
 }
-
-done_testing();
diff -up Params-Validate-0.97/t/26-isa.t.orig Params-Validate-0.97/t/26-isa.t
--- Params-Validate-0.97/t/26-isa.t.orig	2011-04-20 02:35:48.000000000 +0100
+++ Params-Validate-0.97/t/26-isa.t	2011-04-20 11:03:48.658708770 +0100
@@ -2,7 +2,7 @@ use strict;
 use warnings;
 
 use Params::Validate qw(validate);
-use Test::More;
+use Test::More tests => 13;
 
 {
     my @p = ( foo => 'ClassISA' );
@@ -73,8 +73,6 @@ use Test::More;
     like( $@, qr/was not a 'Thingy'/, 'undef isa' );
 }
 
-done_testing();
-
 package ClassISA;
 
 sub isa {
diff -up Params-Validate-0.97/t/27-string-as-type.t.orig Params-Validate-0.97/t/27-string-as-type.t
--- Params-Validate-0.97/t/27-string-as-type.t.orig	2011-04-20 02:35:48.000000000 +0100
+++ Params-Validate-0.97/t/27-string-as-type.t	2011-04-20 10:29:50.747925846 +0100
@@ -2,7 +2,7 @@ use strict;
 use warnings;
 
 use Params::Validate qw(validate);
-use Test::More;
+use Test::More tests => 2;
 
 {
     my @p = ( foo => 1 );
@@ -24,5 +24,3 @@ use Test::More;
     );
 
 }
-
-done_testing();
diff -up Params-Validate-0.97/t/28-readonly-return.t.orig Params-Validate-0.97/t/28-readonly-return.t
--- Params-Validate-0.97/t/28-readonly-return.t.orig	2011-04-20 02:35:48.000000000 +0100
+++ Params-Validate-0.97/t/28-readonly-return.t	2011-04-20 11:00:57.006024299 +0100
@@ -8,6 +8,7 @@ BEGIN {
         plan skip_all => 'Need File::Temp for this test';
     }
     else {
+        plan tests => 9;
             }
 }
 
@@ -98,5 +99,3 @@ sub val2 {
 
     return $ref;
 }
-
-done_testing();
diff -up Params-Validate-0.97/t/30-hashref-alteration.t.orig Params-Validate-0.97/t/30-hashref-alteration.t
--- Params-Validate-0.97/t/30-hashref-alteration.t.orig	2011-04-20 02:35:48.000000000 +0100
+++ Params-Validate-0.97/t/30-hashref-alteration.t	2011-04-20 10:24:53.876794456 +0100
@@ -1,6 +1,6 @@
 use strict;
 use warnings;
-use Test::More;
+use Test::More tests => 2;
 
 use Params::Validate qw( validate SCALAR );
 
@@ -47,5 +47,3 @@ sub val2 {
 
     return;
 }
-
-done_testing();
diff -up Params-Validate-0.97/t/31-incorrect-spelling.t.orig Params-Validate-0.97/t/31-incorrect-spelling.t
--- Params-Validate-0.97/t/31-incorrect-spelling.t.orig	2011-04-20 02:35:48.000000000 +0100
+++ Params-Validate-0.97/t/31-incorrect-spelling.t	2011-04-20 11:55:32.764323977 +0100
@@ -57,5 +57,3 @@ plan skip_all => 'Spec validation is dis
 
     like( $@, qr/is not an allowed validation spec key/ );
 }
-
-done_testing();
diff -up Params-Validate-0.97/t/lib/PVTests/Callbacks.pm.orig Params-Validate-0.97/t/lib/PVTests/Callbacks.pm
--- Params-Validate-0.97/t/lib/PVTests/Callbacks.pm.orig	2011-04-20 02:35:48.000000000 +0100
+++ Params-Validate-0.97/t/lib/PVTests/Callbacks.pm	2011-04-20 11:11:54.594245824 +0100
@@ -9,6 +9,8 @@ use PVTests;
 use Test::More;
 
 sub run_tests {
+    plan tests => 3;
+
     my %allowed = ( foo => 1, baz => 1 );
     eval {
         my @a = ( foo => 'foo' );
@@ -49,8 +51,6 @@ sub run_tests {
     # 0.56.
     eval { Foo->new( storage => 'InMemory', file => 'something' ); };
     is( $@, q{} );
-
-    done_testing();
 }
 
 package Foo;
diff -up Params-Validate-0.97/t/lib/PVTests/Defaults.pm.orig Params-Validate-0.97/t/lib/PVTests/Defaults.pm
--- Params-Validate-0.97/t/lib/PVTests/Defaults.pm.orig	2011-04-20 02:35:48.000000000 +0100
+++ Params-Validate-0.97/t/lib/PVTests/Defaults.pm	2011-04-20 11:11:20.716979927 +0100
@@ -9,6 +9,8 @@ use PVTests;
 use Test::More;
 
 sub run_tests {
+    plan tests => 21;
+
     {
         my %def = eval { foo() };
 
@@ -138,8 +140,6 @@ sub run_tests {
             'defaults pointing to a reference return a copy of that reference'
         );
     }
-
-    done_testing();
 }
 
 sub foo {
diff -up Params-Validate-0.97/t/lib/PVTests/Standard.pm.orig Params-Validate-0.97/t/lib/PVTests/Standard.pm
--- Params-Validate-0.97/t/lib/PVTests/Standard.pm.orig	2011-04-20 02:35:48.000000000 +0100
+++ Params-Validate-0.97/t/lib/PVTests/Standard.pm	2011-04-20 11:10:26.516554927 +0100
@@ -647,6 +647,7 @@ my @Tests = (
 sub run_tests {
     my $count = scalar @Tests;
     $count++ for grep { $_->{return} } @Tests;
+    plan tests => $count;
 
     for my $test (@Tests) {
         if ( $test->{options} ) {
@@ -681,8 +682,6 @@ sub run_tests {
                 "check return value for $sub - array" );
         }
     }
-
-    done_testing();
 }
 
 sub sub1 {
diff -up Params-Validate-0.97/t/lib/PVTests/With.pm.orig Params-Validate-0.97/t/lib/PVTests/With.pm
--- Params-Validate-0.97/t/lib/PVTests/With.pm.orig	2011-04-20 02:35:48.000000000 +0100
+++ Params-Validate-0.97/t/lib/PVTests/With.pm	2011-04-20 11:12:23.442730020 +0100
@@ -9,6 +9,8 @@ use PVTests;
 use Test::More;
 
 sub run_tests {
+    plan tests => 13;
+
     eval { validate_with( params => ['foo'], spec => [SCALAR], ); };
     is( $@, q{} );
 
@@ -119,7 +121,6 @@ sub run_tests {
         is( $p{foo}, 1 );
     }
 
-    done_testing();
 }
 
 1;
diff -up Params-Validate-0.97/t/release-cpan-changes.t.orig Params-Validate-0.97/t/release-cpan-changes.t
--- Params-Validate-0.97/t/release-cpan-changes.t.orig	2011-04-20 02:35:48.000000000 +0100
+++ Params-Validate-0.97/t/release-cpan-changes.t	2011-04-20 12:33:21.996033919 +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 Params-Validate-0.97/t/release-pp-03-attribute.t.orig Params-Validate-0.97/t/release-pp-03-attribute.t
--- Params-Validate-0.97/t/release-pp-03-attribute.t.orig	2011-04-20 02:35:48.000000000 +0100
+++ Params-Validate-0.97/t/release-pp-03-attribute.t	2011-04-20 10:28:25.985754626 +0100
@@ -8,6 +8,7 @@ BEGIN {
     }
 
     $ENV{PERL_TEST_PV} = 1;
+    plan tests => 10;
 }
 
 use strict;
@@ -110,5 +111,3 @@ is(
     'Call quux'
 );
 
-done_testing();
-
diff -up Params-Validate-0.97/t/release-pp-06-options.t.orig Params-Validate-0.97/t/release-pp-06-options.t
--- Params-Validate-0.97/t/release-pp-06-options.t.orig	2011-04-20 02:35:48.000000000 +0100
+++ Params-Validate-0.97/t/release-pp-06-options.t	2011-04-20 10:25:58.323809123 +0100
@@ -8,6 +8,7 @@ BEGIN {
     }
 
     $ENV{PERL_TEST_PV} = 1;
+    plan tests => 4;
 }
 
 use strict;
@@ -48,5 +49,3 @@ my $e = $@;
 is( $e->{hash}, 'ref' );
 ok( eval { $e->isa('Dead'); 1; } );
 
-done_testing();
-
diff -up Params-Validate-0.97/t/release-pp-16-normalize.t.orig Params-Validate-0.97/t/release-pp-16-normalize.t
--- Params-Validate-0.97/t/release-pp-16-normalize.t.orig	2011-04-20 02:35:48.000000000 +0100
+++ Params-Validate-0.97/t/release-pp-16-normalize.t	2011-04-20 11:12:57.961095513 +0100
@@ -6,6 +6,7 @@ BEGIN {
     unless ( $ENV{RELEASE_TESTING} ) {
         plan skip_all => 'these tests are for testing by the release';
     }
+    plan tests => 5;
 
     $ENV{PERL_TEST_PV} = 1;
 }
@@ -80,5 +81,3 @@ like( $@, qr/normalize_keys.+a defined v
 eval { sub5( foo => 5, bar => 5 ) };
 like( $@, qr/normalize_keys.+already exists/ );
 
-done_testing();
-
diff -up Params-Validate-0.97/t/release-pp-17-callbacks.t.orig Params-Validate-0.97/t/release-pp-17-callbacks.t
--- Params-Validate-0.97/t/release-pp-17-callbacks.t.orig	2011-04-20 02:35:48.000000000 +0100
+++ Params-Validate-0.97/t/release-pp-17-callbacks.t	2011-04-20 10:27:38.515378141 +0100
@@ -8,6 +8,7 @@ BEGIN {
     }
 
     $ENV{PERL_TEST_PV} = 1;
+    plan tests => 4;
 }
 
 use strict;
@@ -87,5 +88,3 @@ use Test::More;
     is( $@, q{} );
 }
 
-done_testing();
-
diff -up Params-Validate-0.97/t/release-pp-18-depends.t.orig Params-Validate-0.97/t/release-pp-18-depends.t
--- Params-Validate-0.97/t/release-pp-18-depends.t.orig	2011-04-20 02:35:48.000000000 +0100
+++ Params-Validate-0.97/t/release-pp-18-depends.t	2011-04-20 11:05:49.417480941 +0100
@@ -6,6 +6,7 @@ BEGIN {
     unless ( $ENV{RELEASE_TESTING} ) {
         plan skip_all => 'these tests are for testing by the release';
     }
+    plan tests => 19;
 
     $ENV{PERL_TEST_PV} = 1;
 }
@@ -170,5 +171,3 @@ use Test::More;
     );
 }
 
-done_testing();
-
diff -up Params-Validate-0.97/t/release-pp-19-untaint.t.orig Params-Validate-0.97/t/release-pp-19-untaint.t
--- Params-Validate-0.97/t/release-pp-19-untaint.t.orig	2011-04-20 02:35:48.000000000 +0100
+++ Params-Validate-0.97/t/release-pp-19-untaint.t	2011-04-20 10:56:53.620186893 +0100
@@ -21,6 +21,7 @@ eval "use Test::Taint 0.02";
 if ($@) {
     plan skip_all => 'These tests require Test::Taint 0.02+ to run';
 }
+plan tests => 9;
 
 taint_checking_ok('These tests are meaningless unless we are in taint mode.');
 
@@ -96,5 +97,3 @@ taint_checking_ok('These tests are meani
     tainted_ok( $new_value, 'value is still tainted after validation' );
 }
 
-done_testing();
-
diff -up Params-Validate-0.97/t/release-pp-21-can.t.orig Params-Validate-0.97/t/release-pp-21-can.t
--- Params-Validate-0.97/t/release-pp-21-can.t.orig	2011-04-20 02:35:48.000000000 +0100
+++ Params-Validate-0.97/t/release-pp-21-can.t	2011-04-20 11:02:37.339621887 +0100
@@ -6,6 +6,7 @@ BEGIN {
     unless ( $ENV{RELEASE_TESTING} ) {
         plan skip_all => 'these tests are for testing by the release';
     }
+    plan tests => 13;
 
     $ENV{PERL_TEST_PV} = 1;
 }
@@ -91,8 +92,6 @@ use Test::More;
     like( $@, qr/does not have the method: 'thingy'/, 'undef can' );
 }
 
-done_testing();
-
 package ClassCan;
 
 sub can {
diff -up Params-Validate-0.97/t/release-pp-22-overload-can-bug.t.orig Params-Validate-0.97/t/release-pp-22-overload-can-bug.t
--- Params-Validate-0.97/t/release-pp-22-overload-can-bug.t.orig	2011-04-20 02:35:48.000000000 +0100
+++ Params-Validate-0.97/t/release-pp-22-overload-can-bug.t	2011-04-20 11:01:57.518431430 +0100
@@ -8,6 +8,7 @@ BEGIN {
     }
 
     $ENV{PERL_TEST_PV} = 1;
+    plan tests => 2;
 }
 
 use strict;
@@ -47,5 +48,3 @@ my $ovl = Overloaded->new;
     is( $@, q{}, 'overloaded object->foo' );
 }
 
-done_testing();
-
diff -up Params-Validate-0.97/t/release-pp-23-readonly.t.orig Params-Validate-0.97/t/release-pp-23-readonly.t
--- Params-Validate-0.97/t/release-pp-23-readonly.t.orig	2011-04-20 02:35:48.000000000 +0100
+++ Params-Validate-0.97/t/release-pp-23-readonly.t	2011-04-20 11:01:28.749959158 +0100
@@ -8,6 +8,7 @@ BEGIN {
     }
 
     $ENV{PERL_TEST_PV} = 1;
+    plan tests => 2;
 }
 
 use strict;
@@ -41,5 +42,3 @@ BEGIN {
     is( $@, q{}, 'validate_pos() call succeeded with Readonly spec hashref' );
 }
 
-done_testing();
-
diff -up Params-Validate-0.97/t/release-pp-24-tied.t.orig Params-Validate-0.97/t/release-pp-24-tied.t
--- Params-Validate-0.97/t/release-pp-24-tied.t.orig	2011-04-20 02:35:48.000000000 +0100
+++ Params-Validate-0.97/t/release-pp-24-tied.t	2011-04-20 11:00:07.415314949 +0100
@@ -8,6 +8,7 @@ BEGIN {
     }
 
     $ENV{PERL_TEST_PV} = 1;
+    plan tests => 6;
 }
 
 use strict;
@@ -125,5 +126,3 @@ SKIP:
     );
 }
 
-done_testing();
-
diff -up Params-Validate-0.97/t/release-pp-25-undef-regex.t.orig Params-Validate-0.97/t/release-pp-25-undef-regex.t
--- Params-Validate-0.97/t/release-pp-25-undef-regex.t.orig	2011-04-20 02:35:48.000000000 +0100
+++ Params-Validate-0.97/t/release-pp-25-undef-regex.t	2011-04-20 10:23:07.190215873 +0100
@@ -8,6 +8,7 @@ BEGIN {
     }
 
     $ENV{PERL_TEST_PV} = 1;
+    plan tests => 2;
 }
 
 use strict;
@@ -26,5 +27,3 @@ use Test::More;
     ok( !@w, 'no warnings' );
 }
 
-done_testing();
-
diff -up Params-Validate-0.97/t/release-pp-26-isa.t.orig Params-Validate-0.97/t/release-pp-26-isa.t
--- Params-Validate-0.97/t/release-pp-26-isa.t.orig	2011-04-20 02:35:48.000000000 +0100
+++ Params-Validate-0.97/t/release-pp-26-isa.t	2011-04-20 10:27:04.491091040 +0100
@@ -14,7 +14,7 @@ use strict;
 use warnings;
 
 use Params::Validate qw(validate);
-use Test::More;
+use Test::More tests => 13;
 
 {
     my @p = ( foo => 'ClassISA' );
@@ -85,8 +85,6 @@ use Test::More;
     like( $@, qr/was not a 'Thingy'/, 'undef isa' );
 }
 
-done_testing();
-
 package ClassISA;
 
 sub isa {
diff -up Params-Validate-0.97/t/release-pp-27-string-as-type.t.orig Params-Validate-0.97/t/release-pp-27-string-as-type.t
--- Params-Validate-0.97/t/release-pp-27-string-as-type.t.orig	2011-04-20 02:35:48.000000000 +0100
+++ Params-Validate-0.97/t/release-pp-27-string-as-type.t	2011-04-20 11:13:17.889193098 +0100
@@ -6,6 +6,7 @@ BEGIN {
     unless ( $ENV{RELEASE_TESTING} ) {
         plan skip_all => 'these tests are for testing by the release';
     }
+    plan tests => 2;
 
     $ENV{PERL_TEST_PV} = 1;
 }
@@ -37,5 +38,3 @@ use Test::More;
 
 }
 
-done_testing();
-
diff -up Params-Validate-0.97/t/release-pp-28-readonly-return.t.orig Params-Validate-0.97/t/release-pp-28-readonly-return.t
--- Params-Validate-0.97/t/release-pp-28-readonly-return.t.orig	2011-04-20 02:35:48.000000000 +0100
+++ Params-Validate-0.97/t/release-pp-28-readonly-return.t	2011-04-20 11:04:30.322185482 +0100
@@ -6,6 +6,7 @@ BEGIN {
     unless ( $ENV{RELEASE_TESTING} ) {
         plan skip_all => 'these tests are for testing by the release';
     }
+    plan tests => 9;
 
     $ENV{PERL_TEST_PV} = 1;
 }
@@ -111,5 +112,3 @@ sub val2 {
     return $ref;
 }
 
-done_testing();
-
diff -up Params-Validate-0.97/t/release-pp-30-hashref-alteration.t.orig Params-Validate-0.97/t/release-pp-30-hashref-alteration.t
--- Params-Validate-0.97/t/release-pp-30-hashref-alteration.t.orig	2011-04-20 02:35:48.000000000 +0100
+++ Params-Validate-0.97/t/release-pp-30-hashref-alteration.t	2011-04-20 11:05:00.818926259 +0100
@@ -6,6 +6,7 @@ BEGIN {
     unless ( $ENV{RELEASE_TESTING} ) {
         plan skip_all => 'these tests are for testing by the release';
     }
+    plan tests => 2;
 
     $ENV{PERL_TEST_PV} = 1;
 }
@@ -60,5 +61,3 @@ sub val2 {
     return;
 }
 
-done_testing();
-
diff -up Params-Validate-0.97/t/release-pp-31-incorrect-spelling.t.orig Params-Validate-0.97/t/release-pp-31-incorrect-spelling.t
--- Params-Validate-0.97/t/release-pp-31-incorrect-spelling.t.orig	2011-04-20 02:35:48.000000000 +0100
+++ Params-Validate-0.97/t/release-pp-31-incorrect-spelling.t	2011-04-20 11:18:01.308246120 +0100
@@ -69,5 +69,3 @@ plan skip_all => 'Spec validation is dis
     like( $@, qr/is not an allowed validation spec key/ );
 }
 
-done_testing();
-