diff -up Package-Stash-0.05/t/01-basic.t.orig Package-Stash-0.05/t/01-basic.t
--- Package-Stash-0.05/t/01-basic.t.orig	2010-05-14 17:41:34.000000000 +0100
+++ Package-Stash-0.05/t/01-basic.t	2010-06-07 09:53:18.570100938 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More tests => 93;
 use Test::Exception;
 
 use Package::Stash;
@@ -269,5 +269,3 @@ dies_ok {
     ok(!$stash->has_package_symbol('&foo'), "got \&foo");
     is($stash->get_package_symbol('foo'), *Baz::foo{IO}, "got foo");
 }
-
-done_testing;
diff -up Package-Stash-0.05/t/02-extension.t.orig Package-Stash-0.05/t/02-extension.t
--- Package-Stash-0.05/t/02-extension.t.orig	2010-05-14 17:41:34.000000000 +0100
+++ Package-Stash-0.05/t/02-extension.t	2010-06-07 09:53:18.571099744 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More tests => 15;
 use Test::Exception;
 
 {
@@ -66,5 +66,3 @@ lives_ok {
 } '... created %Foo::baz successfully';
 
 ok(!defined($Foo::{baz}), '... the %baz slot has still not been created');
-
-done_testing;
diff -up Package-Stash-0.05/t/03-io.t.orig Package-Stash-0.05/t/03-io.t
--- Package-Stash-0.05/t/03-io.t.orig	2010-05-14 17:41:34.000000000 +0100
+++ Package-Stash-0.05/t/03-io.t	2010-06-07 09:53:18.575099708 +0100
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More;
+use Test::More tests => 11;
 use Test::Exception;
 
 {
@@ -46,5 +46,3 @@ use Package::Stash;
     ok($stash->has_package_symbol('baz'), "has baz");
     is($stash->get_package_symbol('baz'), *Foo::foo{IO}, "got the right baz");
 }
-
-done_testing;
diff -up Package-Stash-0.05/t/04-get.t.orig Package-Stash-0.05/t/04-get.t
--- Package-Stash-0.05/t/04-get.t.orig	2010-06-13 18:13:45.000000000 +0100
+++ Package-Stash-0.05/t/04-get.t	2010-06-14 14:32:39.855811492 +0100
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More;
+use Test::More tests => 10;
 
 use Package::Stash;
 
@@ -62,5 +62,3 @@
     is_deeply($stash->get_or_add_package_symbol('@foo'), [1],
             "got the right variable");
 }
-
-done_testing;
diff -up Package-Stash-0.05/t/05-isa.t.orig Package-Stash-0.05/t/05-isa.t
--- Package-Stash-0.05/t/05-isa.t.orig	2010-05-14 17:41:34.000000000 +0100
+++ Package-Stash-0.05/t/05-isa.t	2010-06-07 09:55:14.591128547 +0100
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More;
+use Test::More tests => 1;
 
 use Package::Stash;
 
@@ -16,6 +16,8 @@ use Package::Stash;
 my $stash = Package::Stash->new('Foo');
 my @ISA = ('Bar');
 @{$stash->get_package_symbol('@ISA')} = @ISA;
-isa_ok('Foo', 'Bar');
 
-done_testing;
+SKIP: {
+skip "Test::More >= 0.88 needed for isa_ok() tests on classes", 1 if $Test::More::VERSION < 0.88;
+isa_ok('Foo', 'Bar');
+}
diff -up Package-Stash-0.05/t/06-addsub.t.orig Package-Stash-0.05/t/06-addsub.t
--- Package-Stash-0.05/t/06-addsub.t.orig	2010-06-13 18:13:45.000000000 +0100
+++ Package-Stash-0.05/t/06-addsub.t	2010-06-14 14:14:10.462975877 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More tests => 7;
 use Test::Exception;
 
 BEGIN { $^P |= 0x210 } # PERLDBf_SUBLINE
@@ -41,5 +41,3 @@
 
 is $DB::sub{'Foo::dunk'}, sprintf "%s:%d-%d", "FileName", 100, 199,
     '... got the right %DB::sub value for dunk with specified args';
-
-done_testing;
diff -up Package-Stash-0.05/t/10-synopsis.t.orig Package-Stash-0.05/t/10-synopsis.t
--- Package-Stash-0.05/t/10-synopsis.t.orig	2010-05-14 17:41:34.000000000 +0100
+++ Package-Stash-0.05/t/10-synopsis.t	2010-06-07 09:53:18.596164680 +0100
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More;
+use Test::More tests => 3;
 
 use Package::Stash;
 
@@ -14,5 +14,3 @@ $stash->add_package_symbol('%foo', {bar 
 ok(!$stash->has_package_symbol('$foo'), "doesn't have anything in scalar slot");
 my $namespace = $stash->namespace;
 is_deeply(*{ $namespace->{foo} }{HASH}, {bar => 1}, "namespace works properly");
-
-done_testing;