diff -up Package-Stash-XS-0.23/t/addsub.t.orig Package-Stash-XS-0.23/t/addsub.t
--- Package-Stash-XS-0.23/t/addsub.t.orig	2011-08-08 16:43:44.000000000 +0100
+++ Package-Stash-XS-0.23/t/addsub.t	2011-08-09 09:21:01.223844899 +0100
@@ -2,7 +2,7 @@
 use strict;
 use warnings;
 use lib 't/lib';
-use Test::More;
+use Test::More tests => 7;
 use Test::Fatal;
 
 BEGIN { $^P |= 0x210 } # PERLDBf_SUBLINE
@@ -42,5 +42,3 @@ $foo_stash->add_symbol(
 
 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-XS-0.23/t/author-20-leaks.t.orig Package-Stash-XS-0.23/t/author-20-leaks.t
--- Package-Stash-XS-0.23/t/author-20-leaks.t.orig	2011-08-08 16:43:44.000000000 +0100
+++ Package-Stash-XS-0.23/t/author-20-leaks.t	2011-08-09 09:21:01.309844685 +0100
@@ -17,6 +17,8 @@ use Test::LeakTrace;
 use Package::Stash;
 use Symbol;
 
+plan tests => 25;
+
 {
     package Bar;
 }
@@ -144,7 +146,10 @@ use Symbol;
     ok($foo->has_symbol('@ISA'));
     is(ref($foo->get_symbol('@ISA')), 'ARRAY');
     is_deeply($foo->get_symbol('@ISA'), ['Exporter']);
+    SKIP: {
+    skip "Test::More >= 0.88 needed for isa_ok() tests on classes", 1 if $Test::More::VERSION < 0.88;
     isa_ok('Foo', 'Exporter');
+    }
 }
 
 {
@@ -198,5 +203,3 @@ use Symbol;
         eval { $foo->get_or_add_symbol('&blorg') };
     } "doesn't leak on errors";
 }
-
-done_testing;
diff -up Package-Stash-XS-0.23/t/author-21-leaks-debug.t.orig Package-Stash-XS-0.23/t/author-21-leaks-debug.t
--- Package-Stash-XS-0.23/t/author-21-leaks-debug.t.orig	2011-08-08 16:43:44.000000000 +0100
+++ Package-Stash-XS-0.23/t/author-21-leaks-debug.t	2011-08-09 09:21:01.310844682 +0100
@@ -19,6 +19,8 @@ BEGIN { $^P |= 0x210 } # PERLDBf_SUBLINE
 use Package::Stash;
 use Symbol;
 
+plan tests => 25;
+
 {
     package Bar;
 }
@@ -146,7 +148,10 @@ use Symbol;
     ok($foo->has_symbol('@ISA'));
     is(ref($foo->get_symbol('@ISA')), 'ARRAY');
     is_deeply($foo->get_symbol('@ISA'), ['Exporter']);
+    SKIP: {
+    skip "Test::More >= 0.88 needed for isa_ok() tests on classes", 1 if $Test::More::VERSION < 0.88;
     isa_ok('Foo', 'Exporter');
+    }
 }
 
 {
@@ -200,5 +205,3 @@ use Symbol;
         eval { $foo->get_or_add_symbol('&blorg') };
     } "doesn't leak on errors";
 }
-
-done_testing;
diff -up Package-Stash-XS-0.23/t/basic.t.orig Package-Stash-XS-0.23/t/basic.t
--- Package-Stash-XS-0.23/t/basic.t.orig	2011-08-08 16:43:44.000000000 +0100
+++ Package-Stash-XS-0.23/t/basic.t	2011-08-09 09:21:01.085845240 +0100
@@ -2,7 +2,7 @@
 use strict;
 use warnings;
 use lib 't/lib';
-use Test::More;
+use Test::More tests => 122;
 use Test::Fatal;
 
 use Package::Stash;
@@ -416,5 +416,3 @@ like(exception {
         "list_all_symbols CODE",
     );
 }
-
-done_testing;
diff -up Package-Stash-XS-0.23/t/compile-time.t.orig Package-Stash-XS-0.23/t/compile-time.t
--- Package-Stash-XS-0.23/t/compile-time.t.orig	2011-08-08 16:43:44.000000000 +0100
+++ Package-Stash-XS-0.23/t/compile-time.t	2011-08-09 09:22:00.372698489 +0100
@@ -2,8 +2,6 @@
 use strict;
 use warnings;
 use lib 't/lib';
-use Test::More;
+use Test::More tests => 1;
 
 use_ok('CompileTime');
-
-done_testing;
diff -up Package-Stash-XS-0.23/t/edge-cases.t.orig Package-Stash-XS-0.23/t/edge-cases.t
--- Package-Stash-XS-0.23/t/edge-cases.t.orig	2011-08-08 16:43:44.000000000 +0100
+++ Package-Stash-XS-0.23/t/edge-cases.t	2011-08-09 09:21:27.243780482 +0100
@@ -2,7 +2,7 @@
 use strict;
 use warnings;
 use lib 't/lib';
-use Test::More;
+use Test::More tests => 11;
 use Test::Fatal;
 
 use Package::Stash;
@@ -52,5 +52,3 @@ is(ref($constant), 'CODE', "expanded a c
 # was here)
 is(ref($stash->get_symbol('$glob')), '', "nothing yet");
 is(ref($stash->get_or_add_symbol('$glob')), 'SCALAR', "got an empty scalar");
-
-done_testing;
diff -up Package-Stash-XS-0.23/t/extension.t.orig Package-Stash-XS-0.23/t/extension.t
--- Package-Stash-XS-0.23/t/extension.t.orig	2011-08-08 16:43:44.000000000 +0100
+++ Package-Stash-XS-0.23/t/extension.t	2011-08-09 09:21:01.122845149 +0100
@@ -2,7 +2,7 @@
 use strict;
 use warnings;
 use lib 't/lib';
-use Test::More;
+use Test::More tests => 15;
 use Test::Fatal;
 
 {
@@ -72,5 +72,3 @@ is(exception {
 }, undef, '... created %Foo::baz successfully');
 
 ok(!defined($Foo::{baz}), '... the %baz slot has still not been created');
-
-done_testing;
diff -up Package-Stash-XS-0.23/t/get.t.orig Package-Stash-XS-0.23/t/get.t
--- Package-Stash-XS-0.23/t/get.t.orig	2011-08-08 16:43:44.000000000 +0100
+++ Package-Stash-XS-0.23/t/get.t	2011-08-09 09:21:01.167845036 +0100
@@ -2,7 +2,7 @@
 use strict;
 use warnings;
 use lib 't/lib';
-use Test::More;
+use Test::More tests => 36;
 
 use Package::Stash;
 use Scalar::Util;
@@ -182,5 +182,3 @@ use Scalar::Util;
              "stash has the right variable");
     }
 }
-
-done_testing;
diff -up Package-Stash-XS-0.23/t/io.t.orig Package-Stash-XS-0.23/t/io.t
--- Package-Stash-XS-0.23/t/io.t.orig	2011-08-08 16:43:44.000000000 +0100
+++ Package-Stash-XS-0.23/t/io.t	2011-08-09 09:21:01.151845076 +0100
@@ -2,7 +2,7 @@
 use strict;
 use warnings;
 use lib 't/lib';
-use Test::More;
+use Test::More tests => 11;
 use Test::Fatal;
 
 {
@@ -47,5 +47,3 @@ use Package::Stash;
     ok($stash->has_symbol('baz'), "has baz");
     is($stash->get_symbol('baz'), *Foo::foo{IO}, "got the right baz");
 }
-
-done_testing;
diff -up Package-Stash-XS-0.23/t/isa.t.orig Package-Stash-XS-0.23/t/isa.t
--- Package-Stash-XS-0.23/t/isa.t.orig	2011-08-08 16:43:44.000000000 +0100
+++ Package-Stash-XS-0.23/t/isa.t	2011-08-09 09:21:01.199844957 +0100
@@ -2,7 +2,7 @@
 use strict;
 use warnings;
 use lib 't/lib';
-use Test::More;
+use Test::More tests => 1;
 
 use Package::Stash;
 
@@ -17,6 +17,7 @@ use Package::Stash;
 my $stash = Package::Stash->new('Foo');
 my @ISA = ('Bar');
 @{$stash->get_or_add_symbol('@ISA')} = @ISA;
+SKIP: {
+skip "Test::More >= 0.88 needed for isa_ok() tests on classes", 1 if $Test::More::VERSION < 0.88;
 isa_ok('Foo', 'Bar');
-
-done_testing;
+}
diff -up Package-Stash-XS-0.23/t/scalar-values.t.orig Package-Stash-XS-0.23/t/scalar-values.t
--- Package-Stash-XS-0.23/t/scalar-values.t.orig	2011-08-08 16:43:44.000000000 +0100
+++ Package-Stash-XS-0.23/t/scalar-values.t	2011-08-09 09:22:00.396698428 +0100
@@ -2,7 +2,7 @@
 use strict;
 use warnings;
 use lib 't/lib';
-use Test::More;
+use Test::More tests => 14;
 use Test::Fatal;
 
 use B;
@@ -49,5 +49,3 @@ my $vstring = v1.2.3;
 is(reftype(\$vstring), ($] < 5.010 ? 'SCALAR' : 'VSTRING'));
 is(exception { $Bar->add_symbol('$vstring', \$vstring) }, undef,
    "can add vstring values");
-
-done_testing;
diff -up Package-Stash-XS-0.23/t/stash-deletion.t.orig Package-Stash-XS-0.23/t/stash-deletion.t
--- Package-Stash-XS-0.23/t/stash-deletion.t.orig	2011-08-08 16:43:44.000000000 +0100
+++ Package-Stash-XS-0.23/t/stash-deletion.t	2011-08-09 09:22:00.396698428 +0100
@@ -2,7 +2,7 @@
 use strict;
 use warnings;
 use lib 't/lib';
-use Test::More;
+use Test::More tests => 2;
 
 use Package::Stash;
 
@@ -20,5 +20,3 @@ use Package::Stash;
     }
     ok(!$delete->has_symbol('&bar'), "method goes away when stash is deleted");
 }
-
-done_testing;
diff -up Package-Stash-XS-0.23/t/synopsis.t.orig Package-Stash-XS-0.23/t/synopsis.t
--- Package-Stash-XS-0.23/t/synopsis.t.orig	2011-08-08 16:43:44.000000000 +0100
+++ Package-Stash-XS-0.23/t/synopsis.t	2011-08-09 09:21:01.274844771 +0100
@@ -2,7 +2,7 @@
 use strict;
 use warnings;
 use lib 't/lib';
-use Test::More;
+use Test::More tests => 3;
 
 use Package::Stash;
 
@@ -15,5 +15,3 @@ $stash->add_symbol('%foo', {bar => 1});
 ok(!$stash->has_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;