Index: Package-Stash-XS-0.22/t/01-basic.t
===================================================================
--- Package-Stash-XS-0.22.orig/t/01-basic.t
+++ Package-Stash-XS-0.22/t/01-basic.t
@@ -2,7 +2,7 @@
 use strict;
 use warnings;
 use lib 't/lib';
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Package::Stash;
@@ -417,4 +417,4 @@ like(exception {
     );
 }
 
-done_testing;
+#done_testing;
Index: Package-Stash-XS-0.22/t/02-extension.t
===================================================================
--- Package-Stash-XS-0.22.orig/t/02-extension.t
+++ Package-Stash-XS-0.22/t/02-extension.t
@@ -2,7 +2,7 @@
 use strict;
 use warnings;
 use lib 't/lib';
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 {
@@ -73,4 +73,4 @@ is(exception {
 
 ok(!defined($Foo::{baz}), '... the %baz slot has still not been created');
 
-done_testing;
+#done_testing;
Index: Package-Stash-XS-0.22/t/03-io.t
===================================================================
--- Package-Stash-XS-0.22.orig/t/03-io.t
+++ Package-Stash-XS-0.22/t/03-io.t
@@ -2,7 +2,7 @@
 use strict;
 use warnings;
 use lib 't/lib';
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 {
@@ -48,4 +48,4 @@ use Package::Stash;
     is($stash->get_symbol('baz'), *Foo::foo{IO}, "got the right baz");
 }
 
-done_testing;
+#done_testing;
Index: Package-Stash-XS-0.22/t/04-get.t
===================================================================
--- Package-Stash-XS-0.22.orig/t/04-get.t
+++ Package-Stash-XS-0.22/t/04-get.t
@@ -2,7 +2,7 @@
 use strict;
 use warnings;
 use lib 't/lib';
-use Test::More;
+use Test::More qw(no_plan);
 
 use Package::Stash;
 use Scalar::Util;
@@ -183,4 +183,4 @@ use Scalar::Util;
     }
 }
 
-done_testing;
+#done_testing;
Index: Package-Stash-XS-0.22/t/05-isa.t
===================================================================
--- Package-Stash-XS-0.22.orig/t/05-isa.t
+++ Package-Stash-XS-0.22/t/05-isa.t
@@ -2,7 +2,7 @@
 use strict;
 use warnings;
 use lib 't/lib';
-use Test::More;
+use Test::More qw(no_plan);
 
 use Package::Stash;
 
@@ -19,4 +19,4 @@ my @ISA = ('Bar');
 @{$stash->get_or_add_symbol('@ISA')} = @ISA;
 isa_ok('Foo', 'Bar');
 
-done_testing;
+#done_testing;
Index: Package-Stash-XS-0.22/t/06-addsub.t
===================================================================
--- Package-Stash-XS-0.22.orig/t/06-addsub.t
+++ Package-Stash-XS-0.22/t/06-addsub.t
@@ -2,7 +2,7 @@
 use strict;
 use warnings;
 use lib 't/lib';
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 BEGIN { $^P |= 0x210 } # PERLDBf_SUBLINE
@@ -43,4 +43,4 @@ $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;
+#done_testing;
Index: Package-Stash-XS-0.22/t/07-edge-cases.t
===================================================================
--- Package-Stash-XS-0.22.orig/t/07-edge-cases.t
+++ Package-Stash-XS-0.22/t/07-edge-cases.t
@@ -2,7 +2,7 @@
 use strict;
 use warnings;
 use lib 't/lib';
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Package::Stash;
@@ -81,4 +81,4 @@ use_ok('CompileTime');
     ok(!$delete->has_symbol('&bar'), "method goes away when stash is deleted");
 }
 
-done_testing;
+#done_testing;
Index: Package-Stash-XS-0.22/t/10-synopsis.t
===================================================================
--- Package-Stash-XS-0.22.orig/t/10-synopsis.t
+++ Package-Stash-XS-0.22/t/10-synopsis.t
@@ -2,7 +2,7 @@
 use strict;
 use warnings;
 use lib 't/lib';
-use Test::More;
+use Test::More qw(no_plan);
 
 use Package::Stash;
 
@@ -16,4 +16,4 @@ ok(!$stash->has_symbol('$foo'), "doesn't
 my $namespace = $stash->namespace;
 is_deeply(*{ $namespace->{foo} }{HASH}, {bar => 1}, "namespace works properly");
 
-done_testing;
+#done_testing;