--- Package-Stash-0.33/t/00-compile.t
+++ Package-Stash-0.33/t/00-compile.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 
 
--- Package-Stash-0.33/t/addsub.t
+++ Package-Stash-0.33/t/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 @@
 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;
--- Package-Stash-0.33/t/author-leaks-debug.t
+++ Package-Stash-0.33/t/author-leaks-debug.t
@@ -10,7 +10,7 @@
 use strict;
 use warnings;
 use lib 't/lib';
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 use Test::LeakTrace;
 
@@ -209,4 +209,4 @@
     } "doesn't leak on errors";
 }
 
-done_testing;
+#done_testing;
--- Package-Stash-0.33/t/author-leaks.t
+++ Package-Stash-0.33/t/author-leaks.t
@@ -10,7 +10,7 @@
 use strict;
 use warnings;
 use lib 't/lib';
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 use Test::LeakTrace;
 
@@ -207,4 +207,4 @@
     } "doesn't leak on errors";
 }
 
-done_testing;
+#done_testing;
--- Package-Stash-0.33/t/basic.t
+++ Package-Stash-0.33/t/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;
@@ -437,4 +437,4 @@
     "module name must be a string"
 );
 
-done_testing;
+#done_testing;
--- Package-Stash-0.33/t/compile-time.t
+++ Package-Stash-0.33/t/compile-time.t
@@ -2,8 +2,8 @@
 use strict;
 use warnings;
 use lib 't/lib';
-use Test::More;
+use Test::More qw(no_plan);
 
 use_ok('CompileTime');
 
-done_testing;
+#done_testing;
--- Package-Stash-0.33/t/edge-cases.t
+++ Package-Stash-0.33/t/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;
@@ -53,4 +53,4 @@
 is(ref($stash->get_symbol('$glob')), '', "nothing yet");
 is(ref($stash->get_or_add_symbol('$glob')), 'SCALAR', "got an empty scalar");
 
-done_testing;
+#done_testing;
--- Package-Stash-0.33/t/extension.t
+++ Package-Stash-0.33/t/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 @@
 
 ok(!defined($Foo::{baz}), '... the %baz slot has still not been created');
 
-done_testing;
+#done_testing;
--- Package-Stash-0.33/t/get.t
+++ Package-Stash-0.33/t/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 @@
     }
 }
 
-done_testing;
+#done_testing;
--- Package-Stash-0.33/t/impl-selection/basic-pp.t
+++ Package-Stash-0.33/t/impl-selection/basic-pp.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 BEGIN { $Package::Stash::IMPLEMENTATION = 'PP' }
@@ -421,4 +421,4 @@
     );
 }
 
-done_testing;
+#done_testing;
--- Package-Stash-0.33/t/impl-selection/basic-xs.t
+++ Package-Stash-0.33/t/impl-selection/basic-xs.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 use Test::Requires 'Package::Stash::XS';
 
@@ -422,4 +422,4 @@
     );
 }
 
-done_testing;
+#done_testing;
--- Package-Stash-0.33/t/impl-selection/choice.t
+++ Package-Stash-0.33/t/impl-selection/choice.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 
 my $has_xs = eval "require Package::Stash::XS; 1";
 
@@ -14,4 +14,4 @@
    "autodetected properly: $expected");
 can_ok('Package::Stash', 'new');
 
-done_testing;
+#done_testing;
--- Package-Stash-0.33/t/impl-selection/env.t
+++ Package-Stash-0.33/t/impl-selection/env.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 
 # XXX: work around dumb core segfault bug when you delete stashes
 sub get_impl { eval '$Package::Stash::IMPLEMENTATION' }
@@ -26,4 +26,4 @@
     can_ok('Package::Stash', 'new');
 }
 
-done_testing;
+#done_testing;
--- Package-Stash-0.33/t/impl-selection/var.t
+++ Package-Stash-0.33/t/impl-selection/var.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 
 # XXX: work around dumb core segfault bug when you delete stashes
 sub get_impl { eval '$Package::Stash::IMPLEMENTATION' }
@@ -26,4 +26,4 @@
     can_ok('Package::Stash', 'new');
 }
 
-done_testing;
+#done_testing;
--- Package-Stash-0.33/t/io.t
+++ Package-Stash-0.33/t/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 @@
     is($stash->get_symbol('baz'), *Foo::foo{IO}, "got the right baz");
 }
 
-done_testing;
+#done_testing;
--- Package-Stash-0.33/t/isa.t
+++ Package-Stash-0.33/t/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 @@
 @{$stash->get_or_add_symbol('@ISA')} = @ISA;
 isa_ok('Foo', 'Bar');
 
-done_testing;
+#done_testing;
--- Package-Stash-0.33/t/paamayim_nekdotayim.t
+++ Package-Stash-0.33/t/paamayim_nekdotayim.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;
@@ -25,4 +25,4 @@
     "can't add symbol with ::"
 );
 
-done_testing;
+#done_testing;
--- Package-Stash-0.33/t/release-eol.t
+++ Package-Stash-0.33/t/release-eol.t
@@ -8,7 +8,7 @@
 
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 
 eval 'use Test::EOL';
 plan skip_all => 'Test::EOL required' if $@;
--- Package-Stash-0.33/t/release-no-tabs.t
+++ Package-Stash-0.33/t/release-no-tabs.t
@@ -8,7 +8,7 @@
 
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 
 eval 'use Test::NoTabs';
 plan skip_all => 'Test::NoTabs required' if $@;
--- Package-Stash-0.33/t/release-pod-coverage.t
+++ Package-Stash-0.33/t/release-pod-coverage.t
@@ -8,7 +8,7 @@
 }
 
 
-use Test::More;
+use Test::More qw(no_plan);
 
 eval "use Test::Pod::Coverage 1.08";
 plan skip_all => "Test::Pod::Coverage 1.08 required for testing POD coverage"
--- Package-Stash-0.33/t/release-pod-syntax.t
+++ Package-Stash-0.33/t/release-pod-syntax.t
@@ -7,7 +7,7 @@
   }
 }
 
-use Test::More;
+use Test::More qw(no_plan);
 
 eval "use Test::Pod 1.41";
 plan skip_all => "Test::Pod 1.41 required for testing POD" if $@;
--- Package-Stash-0.33/t/scalar-values.t
+++ Package-Stash-0.33/t/scalar-values.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 B;
@@ -50,4 +50,4 @@
 is(exception { $Bar->add_symbol('$vstring', \$vstring) }, undef,
    "can add vstring values");
 
-done_testing;
+#done_testing;
--- Package-Stash-0.33/t/stash-deletion.t
+++ Package-Stash-0.33/t/stash-deletion.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;
 
@@ -21,4 +21,4 @@
     ok(!$delete->has_symbol('&bar'), "method goes away when stash is deleted");
 }
 
-done_testing;
+#done_testing;
--- Package-Stash-0.33/t/synopsis.t
+++ Package-Stash-0.33/t/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 @@
 my $namespace = $stash->namespace;
 is_deeply(*{ $namespace->{foo} }{HASH}, {bar => 1}, "namespace works properly");
 
-done_testing;
+#done_testing;