LogoopenSUSE Build Service > Projects
Sign Up | Log In

View File perl-Moose-old_Test-More.patch of Package perl-Moose (Project openSUSE:12.1)

Index: t/000_load.t
===================================================================
--- t.orig/000_load.t
+++ t/000_load.t
@@ -3,10 +3,10 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 BEGIN {
     use_ok('Moose');
 }
 
-done_testing;
+#done_testing;
Index: t/attributes/accessor_context.t
===================================================================
--- t.orig/attributes/accessor_context.t
+++ t/attributes/accessor_context.t
@@ -2,7 +2,7 @@
 
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 is( exception {
@@ -67,4 +67,4 @@ is( exception {
 
 }, undef, 'testing' );
 
-done_testing;
+#done_testing;
Index: t/attributes/accessor_inlining.t
===================================================================
--- t.orig/attributes/accessor_inlining.t
+++ t/attributes/accessor_inlining.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 
 my $called;
 {
@@ -30,4 +30,4 @@ my $foo = Foo->new(foo => 1);
 is($foo->foo, 1, "got the right value");
 is($called, 1, "reader was called");
 
-done_testing;
+#done_testing;
Index: t/attributes/accessor_override_method.t
===================================================================
--- t.orig/attributes/accessor_override_method.t
+++ t/attributes/accessor_override_method.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 
 use Test::Requires {
     'Test::Output' => '0.01', # skip all if not installed
@@ -33,4 +33,4 @@ stderr_like(sub { $foo_meta->add_attribu
 stderr_like(sub { $foo_meta->add_attribute(has => (is => 'rw')) },
             qr/^You are overwriting a locally defined function \(has\) with an accessor/, 'function overriding gives proper warning');
 
-done_testing;
+#done_testing;
Index: t/attributes/accessor_overwrite_warning.t
===================================================================
--- t.orig/attributes/accessor_overwrite_warning.t
+++ t/attributes/accessor_overwrite_warning.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 use Test::Requires {
     'Test::Output' => '0.01',
@@ -24,4 +24,4 @@ use Test::Requires {
         'overwriting an accessor for another attribute causes a warning';
 }
 
-done_testing;
+#done_testing;
Index: t/attributes/attr_dereference_test.t
===================================================================
--- t.orig/attributes/attr_dereference_test.t
+++ t/attributes/attr_dereference_test.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 
@@ -79,4 +79,4 @@ use Test::Fatal;
     is_deeply [ $autoderef->bar ], [ 1, 2, 3 ], '... auto-dereffed correctly';
 }
 
-done_testing;
+#done_testing;
Index: t/attributes/attribute_accessor_generation.t
===================================================================
--- t.orig/attributes/attribute_accessor_generation.t
+++ t/attributes/attribute_accessor_generation.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Scalar::Util 'isweak';
@@ -203,4 +203,4 @@ use Scalar::Util 'isweak';
     is_deeply( \%hash, { foo => 1, bar => 2 }, "list context");
 }
 
-done_testing;
+#done_testing;
Index: t/attributes/attribute_custom_metaclass.t
===================================================================
--- t.orig/attributes/attribute_custom_metaclass.t
+++ t/attributes/attribute_custom_metaclass.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 
@@ -89,4 +89,4 @@ use Test::Fatal;
     isa_ok($bar_attr, 'Moose::Meta::Attribute');
 }
 
-done_testing;
+#done_testing;
Index: t/attributes/attribute_delegation.t
===================================================================
--- t.orig/attributes/attribute_delegation.t
+++ t/attributes/attribute_delegation.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 
@@ -454,4 +454,4 @@ is($car->stop, 'Engine::stop', '... got
     is( exception { $k->foo_baz }, undef, "but not for class name" );
 }
 
-done_testing;
+#done_testing;
Index: t/attributes/attribute_does.t
===================================================================
--- t.orig/attributes/attribute_does.t
+++ t/attributes/attribute_does.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 
@@ -98,4 +98,4 @@ is( exception {
     }, undef, '... cannot have a isa() which is cannot does()' );
 }
 
-done_testing;
+#done_testing;
Index: t/attributes/attribute_inherited_slot_specs.t
===================================================================
--- t.orig/attributes/attribute_inherited_slot_specs.t
+++ t/attributes/attribute_inherited_slot_specs.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 
@@ -268,4 +268,4 @@ ok(!Foo->meta->get_attribute('bling')->h
 ok(Bar->meta->get_attribute('bling')->has_handles,
    '... Bar::foo should handles');
 
-done_testing;
+#done_testing;
Index: t/attributes/attribute_lazy_initializer.t
===================================================================
--- t.orig/attributes/attribute_lazy_initializer.t
+++ t/attributes/attribute_lazy_initializer.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 
@@ -147,4 +147,4 @@ isnt( exception {
     Fail::Bar->new(foo => 10)
 }, undef, '... this fails, because initializer returns a bad type' );
 
-done_testing;
+#done_testing;
Index: t/attributes/attribute_names.t
===================================================================
--- t.orig/attributes/attribute_names.t
+++ t/attributes/attribute_names.t
@@ -2,7 +2,7 @@
 
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 my $exception_regex = qr/You must provide a name for the attribute/;
@@ -56,4 +56,4 @@ my $exception_regex = qr/You must provid
     }, undef, 'has 0; works now' );
 }
 
-done_testing;
+#done_testing;
Index: t/attributes/attribute_reader_generation.t
===================================================================
--- t.orig/attributes/attribute_reader_generation.t
+++ t/attributes/attribute_reader_generation.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 
@@ -82,4 +82,4 @@ use Test::Fatal;
     is($foo->get_lazy_foo(), 100, '... got the correct value');
 }
 
-done_testing;
+#done_testing;
Index: t/attributes/attribute_required.t
===================================================================
--- t.orig/attributes/attribute_required.t
+++ t/attributes/attribute_required.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 
@@ -65,4 +65,4 @@ like( exception {
     Foo->new;
 }, qr/^Attribute \(bar\) is required/, '... must supply all the required attribute' );
 
-done_testing;
+#done_testing;
Index: t/attributes/attribute_traits.t
===================================================================
--- t.orig/attributes/attribute_traits.t
+++ t/attributes/attribute_traits.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Moose;
 
 
@@ -62,4 +62,4 @@ ok(!$gorch_attr->does('My::Attribute::Tr
 ok(!$gorch_attr->has_applied_traits, '... no traits applied');
 is($gorch_attr->applied_traits, undef, '... no traits applied');
 
-done_testing;
+#done_testing;
Index: t/attributes/attribute_traits_n_meta.t
===================================================================
--- t.orig/attributes/attribute_traits_n_meta.t
+++ t/attributes/attribute_traits_n_meta.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Moose;
 
 
@@ -62,4 +62,4 @@ isa_ok($c->meta->get_attribute('bar'), '
 does_ok($c->meta->get_attribute('bar'), 'My::Attribute::Trait');
 is($c->meta->get_attribute('bar')->_is_metadata, 'ro', '... got the right metaclass customization');
 
-done_testing;
+#done_testing;
Index: t/attributes/attribute_traits_parameterized.t
===================================================================
--- t.orig/attributes/attribute_traits_parameterized.t
+++ t/attributes/attribute_traits_parameterized.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 
 {
     package My::Attribute::Trait;
@@ -55,4 +55,4 @@ is($other_attr->reversed, 'oof', 'the al
 ok(!$other_attr->can('enam'), "the method was not installed under the other class' alias");
 ok(!$other_attr->can('reversed_name'), "the method was not installed under the original name when that was excluded");
 
-done_testing;
+#done_testing;
Index: t/attributes/attribute_traits_registered.t
===================================================================
--- t.orig/attributes/attribute_traits_registered.t
+++ t/attributes/attribute_traits_registered.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Moose;
 
 
@@ -113,4 +113,4 @@ ok(!$derived_bar_attr->does('Fictional')
 can_ok($quux, 'additional_method');
 is(eval { $quux->additional_method }, 42, '... got the right value for additional_method');
 
-done_testing;
+#done_testing;
Index: t/attributes/attribute_triggers.t
===================================================================
--- t.orig/attributes/attribute_triggers.t
+++ t/attributes/attribute_triggers.t
@@ -5,7 +5,7 @@ use warnings;
 
 use Scalar::Util 'isweak';
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 
@@ -218,4 +218,4 @@ use Test::Fatal;
     Foo->meta->make_immutable, redo if Foo->meta->is_mutable;
 }
 
-done_testing;
+#done_testing;
Index: t/attributes/attribute_type_unions.t
===================================================================
--- t.orig/attributes/attribute_type_unions.t
+++ t/attributes/attribute_type_unions.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 
@@ -95,4 +95,4 @@ isnt( exception {
     Bar->new(baz => {})
 }, undef, '... didnt create a new Bar with baz as a HASH ref' );
 
-done_testing;
+#done_testing;
Index: t/attributes/attribute_without_any_methods.t
===================================================================
--- t.orig/attributes/attribute_without_any_methods.t
+++ t/attributes/attribute_without_any_methods.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 use Moose ();
 use Moose::Meta::Class;
@@ -21,4 +21,4 @@ $warn = '';
 $meta->add_attribute('bar', is => 'bare');
 is $warn, '', 'add attribute with no methods and is => "bare"';
 
-done_testing;
+#done_testing;
Index: t/attributes/attribute_writer_generation.t
===================================================================
--- t.orig/attributes/attribute_writer_generation.t
+++ t/attributes/attribute_writer_generation.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Scalar::Util 'isweak';
@@ -116,4 +116,4 @@ use Scalar::Util 'isweak';
     ok(isweak($foo->{foo_weak}), '... it is a weak reference');
 }
 
-done_testing;
+#done_testing;
Index: t/attributes/bad_coerce.t
===================================================================
--- t.orig/attributes/bad_coerce.t
+++ t/attributes/bad_coerce.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 use Test::Requires {
     'Test::Output' => '0.01', # skip all if not installed
@@ -31,4 +31,4 @@ use Test::Requires {
         'Cannot coerce unless the type has a coercion - different attribute';
 }
 
-done_testing;
+#done_testing;
Index: t/attributes/chained_coercion.t
===================================================================
--- t.orig/attributes/chained_coercion.t
+++ t/attributes/chained_coercion.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 {
     package Baz;
@@ -45,4 +45,4 @@ isa_ok($foo->bar, 'Bar');
 isa_ok($foo->bar->baz, 'Baz');
 is($foo->bar->baz->hello, 'World', '... this all worked fine');
 
-done_testing;
+#done_testing;
Index: t/attributes/clone_weak.t
===================================================================
--- t.orig/attributes/clone_weak.t
+++ t/attributes/clone_weak.t
@@ -1,6 +1,6 @@
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 
 {
     package Foo;
@@ -174,4 +174,4 @@ use Test::More;
     is($attr->count($clone), $attr->count($bar), "right count");
 }
 
-done_testing;
+#done_testing;
Index: t/attributes/default_undef.t
===================================================================
--- t.orig/attributes/default_undef.t
+++ t/attributes/default_undef.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Moose;
 
 {
@@ -21,4 +21,4 @@ with_immutable {
     ok(Foo->new->has_foo);
 } 'Foo';
 
-done_testing;
+#done_testing;
Index: t/attributes/delegation_and_modifiers.t
===================================================================
--- t.orig/attributes/delegation_and_modifiers.t
+++ t/attributes/delegation_and_modifiers.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 {
     package Bar;
@@ -53,4 +53,4 @@ is($foo->baz, 'Bar::baz', '... got the r
 
 ok($foo->test, '... the test value has now been changed');
 
-done_testing;
+#done_testing;
Index: t/attributes/delegation_arg_aliasing.t
===================================================================
--- t.orig/attributes/delegation_arg_aliasing.t
+++ t/attributes/delegation_arg_aliasing.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 
 {
     package Foo;
@@ -38,4 +38,4 @@ undef $x;
 $hasfoo->foo_aliased_curried($x);
 is($x, 'bar', "delegated aliasing with currying works");
 
-done_testing;
+#done_testing;
Index: t/attributes/delegation_target_not_loaded.t
===================================================================
--- t.orig/attributes/delegation_target_not_loaded.t
+++ t/attributes/delegation_target_not_loaded.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 {
@@ -32,4 +32,4 @@ use Test::Fatal;
     );
 }
 
-done_testing;
+#done_testing;
Index: t/attributes/illegal_options_for_inheritance.t
===================================================================
--- t.orig/attributes/illegal_options_for_inheritance.t
+++ t/attributes/illegal_options_for_inheritance.t
@@ -2,7 +2,7 @@
 
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 {
@@ -74,4 +74,4 @@ use Test::Fatal;
 my $bar_attr = Bar->meta->get_attribute('bar');
 ok((grep { $_ eq 'my_illegal_option' } $bar_attr->illegal_options_for_inheritance) > 0, '... added my_illegal_option as illegal option for inheritance');
 
-done_testing;
+#done_testing;
Index: t/attributes/inherit_lazy_build.t
===================================================================
--- t.orig/attributes/inherit_lazy_build.t
+++ t/attributes/inherit_lazy_build.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 {
 
@@ -72,4 +72,4 @@ is(
     'attribute defined as lazy_build in child is properly built'
 );
 
-done_testing;
+#done_testing;
Index: t/attributes/lazy_no_default.t
===================================================================
--- t.orig/attributes/lazy_no_default.t
+++ t/attributes/lazy_no_default.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 {
@@ -21,4 +21,4 @@ use Test::Fatal;
     );
 }
 
-done_testing;
+#done_testing;
Index: t/attributes/method_generation_rules.t
===================================================================
--- t.orig/attributes/method_generation_rules.t
+++ t/attributes/method_generation_rules.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 
@@ -60,4 +60,4 @@ is($obj->_foo(), 1, "$class->foo is read
 
 isnt( exception { make_class('ro', 'accessor', "Test::Class::AccessorRO"); }, undef, "Cant define attr with ro + accessor" );
 
-done_testing;
+#done_testing;
Index: t/attributes/misc_attribute_coerce_lazy.t
===================================================================
--- t.orig/attributes/misc_attribute_coerce_lazy.t
+++ t/attributes/misc_attribute_coerce_lazy.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 
@@ -47,4 +47,4 @@ is( exception {
     $r->headers;
 }, undef, '... this coerces and passes the type constraint even with lazy' );
 
-done_testing;
+#done_testing;
Index: t/attributes/misc_attribute_tests.t
===================================================================
--- t.orig/attributes/misc_attribute_tests.t
+++ t/attributes/misc_attribute_tests.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 
@@ -269,4 +269,4 @@ ok(OutOfClassTest->meta->get_attribute('
 
 }
 
-done_testing;
+#done_testing;
Index: t/attributes/more_attr_delegation.t
===================================================================
--- t.orig/attributes/more_attr_delegation.t
+++ t/attributes/more_attr_delegation.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 =pod
@@ -260,4 +260,4 @@ is( $p->child_g_method_1, "g1", "delegat
 can_ok( $p, "child_i_method_1" );
 is( $p->parent_method_1, "parent_1", "delegate doesn't override existing method" );
 
-done_testing;
+#done_testing;
Index: t/attributes/no_init_arg.t
===================================================================
--- t.orig/attributes/no_init_arg.t
+++ t/attributes/no_init_arg.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 
 
@@ -31,4 +31,4 @@ use Test::More;
     is( $foo->foo, "blah", "field is set via setter" );
 }
 
-done_testing;
+#done_testing;
Index: t/attributes/no_slot_access.t
===================================================================
--- t.orig/attributes/no_slot_access.t
+++ t/attributes/no_slot_access.t
@@ -60,7 +60,7 @@ use warnings;
     use Moose;
     use Moose::Util::MetaRole;
 
-    use Test::More;
+    use Test::More qw(no_plan);
     use Test::Fatal;
 
     Moose::Util::MetaRole::apply_metaroles(
@@ -85,5 +85,5 @@ use warnings;
 
     is( exception { __PACKAGE__->meta->make_immutable; }, undef, "Inling constructor does not use inline_slot_access" );
 
-    done_testing;
+    #done_testing;
 }
Index: t/attributes/non_alpha_attr_names.t
===================================================================
--- t.orig/attributes/non_alpha_attr_names.t
+++ t/attributes/non_alpha_attr_names.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Moose;
 
 {
@@ -63,4 +63,4 @@ with_immutable {
 }
 'Foo';
 
-done_testing;
+#done_testing;
Index: t/attributes/numeric_defaults.t
===================================================================
--- t.orig/attributes/numeric_defaults.t
+++ t/attributes/numeric_defaults.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Moose;
 use B;
 
@@ -125,4 +125,4 @@ with_immutable {
     }
 } 'Baz2';
 
-done_testing;
+#done_testing;
Index: t/attributes/trigger_and_coerce.t
===================================================================
--- t.orig/attributes/trigger_and_coerce.t
+++ t/attributes/trigger_and_coerce.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 
 {
@@ -52,4 +52,4 @@ ok( Mortgage->meta->is_immutable, '... M
     isa_ok( $mtg->closing_date, 'Fake::DateTime' );
 }
 
-done_testing;
+#done_testing;
Index: t/author-test-my-dependents.t
===================================================================
--- t.orig/author-test-my-dependents.t
+++ t/author-test-my-dependents.t
@@ -40,7 +40,7 @@ my $exclude = qr/^Acme-/x;
 
 if ( $ENV{MOOSE_TEST_MD_ALL} ) {
     test_all_dependents( 'Moose', { exclude => $exclude } );
-    done_testing;
+    #done_testing;
 }
 else {
     my @modules = map { chomp; $_ } <DATA>;
Index: t/basics/always_strict_warnings.t
===================================================================
--- t.orig/basics/always_strict_warnings.t
+++ t/basics/always_strict_warnings.t
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-use Test::More;
+use Test::More qw(no_plan);
 
 # for classes ...
 {
@@ -68,4 +68,4 @@ use Test::More;
     }
 }
 
-done_testing;
+#done_testing;
Index: t/basics/basic_class_setup.t
===================================================================
--- t.orig/basics/basic_class_setup.t
+++ t/basics/basic_class_setup.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 
@@ -49,4 +49,4 @@ foreach my $import (qw(
     ok(!Foo->can($import), "no namespace pollution in Moose::Object ($import)" );
 }
 
-done_testing;
+#done_testing;
Index: t/basics/buildargs.t
===================================================================
--- t.orig/basics/buildargs.t
+++ t/basics/buildargs.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 {
     package Foo;
@@ -40,4 +40,4 @@ foreach my $class (qw(Foo Bar)) {
     }
 }
 
-done_testing;
+#done_testing;
Index: t/basics/buildargs_warning.t
===================================================================
--- t.orig/basics/buildargs_warning.t
+++ t/basics/buildargs_warning.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use Test::Fatal;
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Moose qw( with_immutable );
 
 use Test::Requires {
@@ -33,4 +33,4 @@ with_immutable {
 }
 'Baz';
 
-done_testing;
+#done_testing;
Index: t/basics/create.t
===================================================================
--- t.orig/basics/create.t
+++ t/basics/create.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 {
@@ -58,4 +58,4 @@ isnt( exception {
 
 # XXX: Continuing::To::Fail gets created anyway
 
-done_testing;
+#done_testing;
Index: t/basics/create_anon.t
===================================================================
--- t.orig/basics/create_anon.t
+++ t/basics/create_anon.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 use Moose::Meta::Class;
 
@@ -124,4 +124,4 @@ use Moose::Meta::Class;
     ok(!$meta, "removing a cached anon class means it's actually gone");
 }
 
-done_testing;
+#done_testing;
Index: t/basics/deprecations.t
===================================================================
--- t.orig/basics/deprecations.t
+++ t/basics/deprecations.t
@@ -2,7 +2,7 @@ use strict;
 use warnings;
 
 use Test::Fatal;
-use Test::More;
+use Test::More qw(no_plan);
 
 use Test::Requires {
     'Test::Output' => '0.01',
@@ -171,5 +171,5 @@ use Test::Requires {
     sub _build_foo { q{} }
 }
 
-done_testing;
+#done_testing;
 
Index: t/basics/destruction.t
===================================================================
--- t.orig/basics/destruction.t
+++ t/basics/destruction.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 our @demolished;
 package Foo;
@@ -50,4 +50,4 @@ is_deeply(\@demolished, ['Foo::Sub::Sub'
           "Foo::Sub::Sub demolished properly");
 @demolished = ();
 
-done_testing;
+#done_testing;
Index: t/basics/error_handling.t
===================================================================
--- t.orig/basics/error_handling.t
+++ t/basics/error_handling.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 # This tests the error handling in Moose::Object only
@@ -18,4 +18,4 @@ like( exception { Foo->new(undef) }, qr/
 
 like( exception { Foo->does() }, qr/^\QYou must supply a role name to does()/, 'Cannot call does() without a role name' );
 
-done_testing;
+#done_testing;
Index: t/basics/global_destruction.t
===================================================================
--- t.orig/basics/global_destruction.t
+++ t/basics/global_destruction.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 {
     package Foo;
@@ -48,4 +48,4 @@ ok(
     'in_global_destruction state is passed to DEMOLISH properly (true)'
 ) for split //, `$^X t/basics/global-destruction-helper.pl`;
 
-done_testing;
+#done_testing;
Index: t/basics/import_unimport.t
===================================================================
--- t.orig/basics/import_unimport.t
+++ t/basics/import_unimport.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 
 my @moose_exports = qw(
@@ -97,4 +97,4 @@ my $blessed;
 can_ok( 'Quux', 'blessed' );
 is( $blessed, \&Scalar::Util::blessed );
 
-done_testing;
+#done_testing;
Index: t/basics/inner_and_augment.t
===================================================================
--- t.orig/basics/inner_and_augment.t
+++ t/basics/inner_and_augment.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 
@@ -116,4 +116,4 @@ is('a.X a.Y b.X b.Y b.Z a.Z',
 
 }
 
-done_testing;
+#done_testing;
Index: t/basics/load_into_main.t
===================================================================
--- t.orig/basics/load_into_main.t
+++ t/basics/load_into_main.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 is( exception {
@@ -15,4 +15,4 @@ isa_ok( main->meta, "Moose::Meta::Class"
 isa_ok( main->new, "main");
 isa_ok( main->new, "Moose::Object" );
 
-done_testing;
+#done_testing;
Index: t/basics/method_modifier_with_regexp.t
===================================================================
--- t.orig/basics/method_modifier_with_regexp.t
+++ t/basics/method_modifier_with_regexp.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 
@@ -83,4 +83,4 @@ is( $Cat::AFTER_BARK_COUNTER,  2, 'after
 
 }
 
-done_testing;
+#done_testing;
Index: t/basics/methods.t
===================================================================
--- t.orig/basics/methods.t
+++ t/basics/methods.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 
 my $test1 = Moose::Meta::Class->create_anon_class;
@@ -43,4 +43,4 @@ isa_ok(
 is( $t2_am->name(), 'Test2',
     'associated_metaclass->name is Test2' );
 
-done_testing;
+#done_testing;
Index: t/basics/moose_object_does.t
===================================================================
--- t.orig/basics/moose_object_does.t
+++ t/basics/moose_object_does.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Moose;
 
 {
@@ -155,4 +155,4 @@ with_immutable {
 }
 qw( Foo Bar Baz Foo::Child Bar::Child Baz::Child );
 
-done_testing;
+#done_testing;
Index: t/basics/moose_respects_type_constraints.t
===================================================================
--- t.orig/basics/moose_respects_type_constraints.t
+++ t/basics/moose_respects_type_constraints.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Moose::Util::TypeConstraints;
@@ -58,4 +58,4 @@ isnt( exception {
     $bar->foo(Foo->new);
 }, undef, '... checked the type constraint correctly' );
 
-done_testing;
+#done_testing;
Index: t/basics/override_and_foreign_classes.t
===================================================================
--- t.orig/basics/override_and_foreign_classes.t
+++ t/basics/override_and_foreign_classes.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 
 =pod
@@ -71,4 +71,4 @@ is($foo->foo(), 'Foo::foo', '... got the
 is($foo->bar(), 'Foo::bar', '... got the right value from &bar');
 is($foo->baz(), 'Foo::baz', '... got the right value from &baz');
 
-done_testing;
+#done_testing;
Index: t/basics/override_augment_inner_super.t
===================================================================
--- t.orig/basics/override_augment_inner_super.t
+++ t/basics/override_augment_inner_super.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 
 {
@@ -68,4 +68,4 @@ is($baz->bar,
     'Bar::bar -> Foo::bar(Baz::bar)',
     '... got the right value from mixed augment/override bar');
 
-done_testing;
+#done_testing;
Index: t/basics/rebless.t
===================================================================
--- t.orig/basics/rebless.t
+++ t/basics/rebless.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 use Scalar::Util 'blessed';
 
@@ -78,4 +78,4 @@ is($bar->lazy_classname, 'Child', "lazy
 
 like( exception { $foo->type_constrained(10.5) }, qr/^Attribute \(type_constrained\) does not pass the type constraint because\: Validation failed for 'Int' with value 10\.5/, '... this failed because of type check' );
 
-done_testing;
+#done_testing;
Index: t/basics/require_superclasses.t
===================================================================
--- t.orig/basics/require_superclasses.t
+++ t/basics/require_superclasses.t
@@ -5,7 +5,7 @@ use warnings;
 
 use lib 't/lib', 'lib';
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 
@@ -60,4 +60,4 @@ use Test::Fatal;
     ::like( ::exception { extends 'Foo', Affe => { -version => 42 } }, qr/Affe version 42 required--this is only version 23/, 'extends with unsatisfied version requirement' );
 }
 
-done_testing;
+#done_testing;
Index: t/basics/super_and_override.t
===================================================================
--- t.orig/basics/super_and_override.t
+++ t/basics/super_and_override.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 
@@ -78,4 +78,4 @@ is($foo->baz(), 'Foo::baz', '... got the
 
 }
 
-done_testing;
+#done_testing;
Index: t/basics/wrapped_method_cxt_propagation.t
===================================================================
--- t.orig/basics/wrapped_method_cxt_propagation.t
+++ t/basics/wrapped_method_cxt_propagation.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 
 {
@@ -55,4 +55,4 @@ foreach my $obj ( $base, $after ) {
     }
 }
 
-done_testing;
+#done_testing;
Index: t/bugs/DEMOLISHALL.t
===================================================================
--- t.orig/bugs/DEMOLISHALL.t
+++ t/bugs/DEMOLISHALL.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 
 my @called;
 
@@ -52,4 +52,4 @@ do {
 
 is_deeply([splice @called], ['Child::DEMOLISHALL', 'Class::DEMOLISHALL', 'Child::DEMOLISH', 'Class::DEMOLISH']);
 
-done_testing;
+#done_testing;
Index: t/bugs/DEMOLISHALL_shortcutted.t
===================================================================
--- t.orig/bugs/DEMOLISHALL_shortcutted.t
+++ t/bugs/DEMOLISHALL_shortcutted.t
@@ -19,7 +19,7 @@ sub DEMOLISH {};
 
 
 package main;
-use Test::More;
+use Test::More qw(no_plan);
 
 my $m = DemolishAll::WithDemolish->new;
 undef $m;
@@ -29,4 +29,4 @@ $m = DemolishAll::WithoutDemolish->new;
 undef $m;
 is ( $Role::DemolishAll::ok, 1, 'DemolishAll wo/ explicit DEMOLISH sub' );
 
-done_testing;
+#done_testing;
Index: t/bugs/DEMOLISH_eats_exceptions.t
===================================================================
--- t.orig/bugs/DEMOLISH_eats_exceptions.t
+++ t/bugs/DEMOLISH_eats_exceptions.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 use FindBin;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 use Moose::Util::TypeConstraints;
 
@@ -148,4 +148,4 @@ sub check_em {
      }
 }
 
-done_testing;
+#done_testing;
Index: t/bugs/DEMOLISH_eats_mini.t
===================================================================
--- t.orig/bugs/DEMOLISH_eats_mini.t
+++ t/bugs/DEMOLISH_eats_mini.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 
@@ -78,4 +78,4 @@ use Test::Fatal;
         if Baz->meta->is_mutable
 }
 
-done_testing;
+#done_testing;
Index: t/bugs/DEMOLISH_fails_without_metaclass.t
===================================================================
--- t.orig/bugs/DEMOLISH_fails_without_metaclass.t
+++ t/bugs/DEMOLISH_fails_without_metaclass.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 {
@@ -31,4 +31,4 @@ Class::MOP::remove_metaclass_by_name('My
 # help us prevent it happening in the future.
 is( exception { $object->DESTROY }, undef, 'can call DESTROY on an object without a metaclass object in the CMOP cache (immutable version)' );
 
-done_testing;
+#done_testing;
Index: t/bugs/Moose_Object_error.t
===================================================================
--- t.orig/bugs/Moose_Object_error.t
+++ t/bugs/Moose_Object_error.t
@@ -5,8 +5,8 @@ use warnings;
 
 use lib 't/lib', 'lib';
 
-use Test::More;
+use Test::More qw(no_plan);
 
 use_ok('MyMooseObject');
 
-done_testing;
+#done_testing;
Index: t/bugs/anon_method_metaclass.t
===================================================================
--- t.orig/bugs/anon_method_metaclass.t
+++ t/bugs/anon_method_metaclass.t
@@ -1,6 +1,6 @@
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 
 {
     package Ball;
@@ -47,4 +47,4 @@ for ( 1, 2 ) {
     undef $method_meta;
 }
 
-done_testing;
+#done_testing;
Index: t/bugs/application_metarole_compat.t
===================================================================
--- t.orig/bugs/application_metarole_compat.t
+++ t/bugs/application_metarole_compat.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 {
@@ -54,4 +54,4 @@ BEGIN {
     ::is( ::exception { extends 'Parent' }, undef );
 }
 
-done_testing;
+#done_testing;
Index: t/bugs/apply_role_to_one_instance_only.t
===================================================================
--- t.orig/bugs/apply_role_to_one_instance_only.t
+++ t/bugs/apply_role_to_one_instance_only.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 {
@@ -41,4 +41,4 @@ is( exception {
     is $instance_with_role1->a_role_method, 'foo'
 }, undef, 'instance has correct role method' );
 
-done_testing;
+#done_testing;
Index: t/bugs/augment_recursion_bug.t
===================================================================
--- t.orig/bugs/augment_recursion_bug.t
+++ t/bugs/augment_recursion_bug.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 
 {
@@ -46,4 +46,4 @@ is($baz->foo,
   'Foo::foo(Baz::foo and Foo::foo())',
   '... got the right value for 1 augmented subclass calling non-augmented subclass');
 
-done_testing;
+#done_testing;
Index: t/bugs/coerce_without_coercion.t
===================================================================
--- t.orig/bugs/coerce_without_coercion.t
+++ t/bugs/coerce_without_coercion.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 use Test::Moose;
 
@@ -29,4 +29,4 @@ with_immutable {
 }
 'Foo';
 
-done_testing;
+#done_testing;
Index: t/bugs/constructor_object_overload.t
===================================================================
--- t.orig/bugs/constructor_object_overload.t
+++ t/bugs/constructor_object_overload.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 
 {
     package Foo;
@@ -17,4 +17,4 @@ use Test::More;
 
 ok(Foo->new()->bug(), 'call constructor on object reference with overloading');
 
-done_testing;
+#done_testing;
Index: t/bugs/create_anon_recursion.t
===================================================================
--- t.orig/bugs/create_anon_recursion.t
+++ t/bugs/create_anon_recursion.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Moose::Meta::Class;
@@ -21,4 +21,4 @@ TODO:
     }, undef, 'Class is created successfully' );
 }
 
-done_testing;
+#done_testing;
Index: t/bugs/handles_foreign_class_bug.t
===================================================================
--- t.orig/bugs/handles_foreign_class_bug.t
+++ t/bugs/handles_foreign_class_bug.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 {
@@ -108,4 +108,4 @@ isa_ok($blart, 'Blart');
 
 is($blart->a, 'Foo::a', '... got the right delgated value');
 
-done_testing;
+#done_testing;
Index: t/bugs/immutable_metaclass_does_role.t
===================================================================
--- t.orig/bugs/immutable_metaclass_does_role.t
+++ t/bugs/immutable_metaclass_does_role.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 
@@ -89,4 +89,4 @@ is( $a->meta->foo, 'i am foo', '... foo
 ok( MyClass->meta->meta->does_role('MyRole'), 'metaclass does MyRole' );
 is( MyClass->meta->foo, 'i am foo', '... foo method returns expected value' );
 
-done_testing;
+#done_testing;
Index: t/bugs/immutable_n_default_x2.t
===================================================================
--- t.orig/bugs/immutable_n_default_x2.t
+++ t/bugs/immutable_n_default_x2.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 
 {
@@ -38,4 +38,4 @@ $foo->bar();
 
 is($Foo::bar_default_called, 1, "bar default was only called once when lazy attribute is accessed");
 
-done_testing;
+#done_testing;
Index: t/bugs/inheriting_from_roles.t
===================================================================
--- t.orig/bugs/inheriting_from_roles.t
+++ t/bugs/inheriting_from_roles.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 
@@ -20,4 +20,4 @@ use Test::Fatal;
     }, qr/You cannot inherit from a Moose Role \(My\:\:Role\)/, '... this croaks correctly' );
 }
 
-done_testing;
+#done_testing;
Index: t/bugs/inline_reader_bug.t
===================================================================
--- t.orig/bugs/inline_reader_bug.t
+++ t/bugs/inline_reader_bug.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 
@@ -28,4 +28,4 @@ test makes sure it does not creep back i
     }, undef, '... this didnt die' );
 }
 
-done_testing;
+#done_testing;
Index: t/bugs/instance_application_role_args.t
===================================================================
--- t.orig/bugs/instance_application_role_args.t
+++ t/bugs/instance_application_role_args.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 
 {
     package Point;
@@ -48,4 +48,4 @@ DoesTranspose->meta->apply( $p, -alias =
 is_deeply($p->negated->inspect, [3, 4]);
 is_deeply($p->transpose->inspect, [3, 4]);
 
-done_testing;
+#done_testing;
Index: t/bugs/lazybuild_required_undef.t
===================================================================
--- t.orig/bugs/lazybuild_required_undef.t
+++ t/bugs/lazybuild_required_undef.t
@@ -17,7 +17,7 @@ has 'bar' => ( isa => 'Int | Undef', is
 sub _build_foo { undef }
 
 package main;
-use Test::More;
+use Test::More qw(no_plan);
 
 ok ( !defined(Foo->new->bar), 'NonLazyBuild: Undef default' );
 ok ( !defined(Foo->new->bar(undef)), 'NonLazyBuild: Undef explicit' );
@@ -27,4 +27,4 @@ ok ( !defined(Foo->new->foo), 'LazyBuild
 ## This test fails at the time of creation.
 ok ( !defined(Foo->new->foo(undef)), 'LazyBuild: Undef explicit' );
 
-done_testing;
+#done_testing;
Index: t/bugs/moose_octal_defaults.t
===================================================================
--- t.orig/bugs/moose_octal_defaults.t
+++ t/bugs/moose_octal_defaults.t
@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-use Test::More;
+use Test::More qw(no_plan);
 
 {
     my $package = qq{
@@ -116,4 +116,4 @@ __PACKAGE__->meta->make_immutable;
     ::is( $obj->id, '0 but true', 'value is still the same' );
 }
 
-done_testing;
+#done_testing;
Index: t/bugs/reader_precedence_bug.t
===================================================================
--- t.orig/bugs/reader_precedence_bug.t
+++ t/bugs/reader_precedence_bug.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 {
     package Foo;
@@ -20,4 +20,4 @@ use Test::More;
     is($foo->$reader, 10, "Reader works as expected");
 }
 
-done_testing;
+#done_testing;
Index: t/bugs/role_caller.t
===================================================================
--- t.orig/bugs/role_caller.t
+++ t/bugs/role_caller.t
@@ -11,7 +11,7 @@ package MyClass2; use Moose; with 'MyRol
 
 package main;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 {
   local $TODO = 'Role composition does not clone methods yet';
@@ -24,4 +24,4 @@ use Test::More;
 isnt(MyClass1->foo, "MyClass2::foo", "role method is not confused with other class" );
 isnt(MyClass2->foo, "MyClass1::foo", "role method is not confused with other class" );
 
-done_testing;
+#done_testing;
Index: t/bugs/subclass_use_base_bug.t
===================================================================
--- t.orig/bugs/subclass_use_base_bug.t
+++ t/bugs/subclass_use_base_bug.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 =pod
 
@@ -27,4 +27,4 @@ my $bar = Bar->new;
 isa_ok($bar, 'Bar');
 isa_ok($bar, 'Foo');
 
-done_testing;
+#done_testing;
Index: t/bugs/subtype_conflict_bug.t
===================================================================
--- t.orig/bugs/subtype_conflict_bug.t
+++ t/bugs/subtype_conflict_bug.t
@@ -5,9 +5,9 @@ use warnings;
 
 use lib 't/lib', 'lib';
 
-use Test::More;
+use Test::More qw(no_plan);
 
 use_ok('MyMooseA');
 use_ok('MyMooseB');
 
-done_testing;
+#done_testing;
Index: t/bugs/subtype_quote_bug.t
===================================================================
--- t.orig/bugs/subtype_quote_bug.t
+++ t/bugs/subtype_quote_bug.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 =pod
 
@@ -33,4 +33,4 @@ be well from now on.
     ::use_ok('Moose');
 }
 
-done_testing;
+#done_testing;
Index: t/bugs/super_recursion.t
===================================================================
--- t.orig/bugs/super_recursion.t
+++ t/bugs/super_recursion.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 {
     package A;
@@ -66,4 +66,4 @@ is( C->new->foo, 'c' );
 is( C->new->bar, 'cb' );
 is( C->new->baz, 'cba' );
 
-done_testing;
+#done_testing;
Index: t/bugs/type_constraint_messages.t
===================================================================
--- t.orig/bugs/type_constraint_messages.t
+++ t/bugs/type_constraint_messages.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 
@@ -64,4 +64,4 @@ like( exception {
     $foo->nt($foo);     # scalar
 }, qr/Attribute \(nt\) does not pass the type constraint because: blessed/, '... got the right error message' );
 
-done_testing;
+#done_testing;
Index: t/bugs/universal_methods_wrappable.t
===================================================================
--- t.orig/bugs/universal_methods_wrappable.t
+++ t/bugs/universal_methods_wrappable.t
@@ -2,7 +2,7 @@ use strict;
 use warnings;
 
 use Test::Fatal;
-use Test::More;
+use Test::More qw(no_plan);
 
 {
 
@@ -18,7 +18,7 @@ use Test::More;
     package Foo;
     use Moose;
 
-    use Test::More; # for $TODO
+    use Test::More qw(no_plan); # for $TODO
 
     local $TODO = 'UNIVERSAL methods should be wrappable';
 
@@ -28,4 +28,4 @@ use Test::More;
     ::isa_ok $foo, 'Bar';
 }
 
-done_testing;
+#done_testing;
Index: t/cmop/ArrayBasedStorage_test.t
===================================================================
--- t.orig/cmop/ArrayBasedStorage_test.t
+++ t/cmop/ArrayBasedStorage_test.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use File::Spec;
 use Scalar::Util 'reftype';
 use Class::MOP;
@@ -201,4 +201,4 @@ my $new_baz = Bar::Baz->new;
 
 cmp_ok( scalar(@$new_baz), ">", scalar(@$baz), "additional slot due to refreshed meta instance" );
 
-done_testing;
+#done_testing;
Index: t/cmop/AttributesWithHistory_test.t
===================================================================
--- t.orig/cmop/AttributesWithHistory_test.t
+++ t/cmop/AttributesWithHistory_test.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use File::Spec;
 
 use Class::MOP;
@@ -118,4 +118,4 @@ is_deeply(
     [ 42, 43, 44, 45, 46 ],
     '... still have the correct history for foo');
 
-done_testing;
+#done_testing;
Index: t/cmop/BinaryTree_test.t
===================================================================
--- t.orig/cmop/BinaryTree_test.t
+++ t/cmop/BinaryTree_test.t
@@ -4,7 +4,7 @@ use warnings;
 use FindBin;
 use File::Spec::Functions;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -329,4 +329,4 @@ sub inOrderTraverse {
         '... this should be the reverse of the original');
 }
 
-done_testing;
+#done_testing;
Index: t/cmop/C3MethodDispatchOrder_test.t
===================================================================
--- t.orig/cmop/C3MethodDispatchOrder_test.t
+++ t/cmop/C3MethodDispatchOrder_test.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use File::Spec;
 use Class::MOP;
 
@@ -42,4 +42,4 @@ is_deeply(
 is(Diamond_D->hello, 'Diamond_C::hello', '... got the right dispatch order');
 is(Diamond_D->can('hello')->(), 'Diamond_C::hello', '... can(method) resolved itself as expected');
 
-done_testing;
+#done_testing;
Index: t/cmop/ClassEncapsulatedAttributes_test.t
===================================================================
--- t.orig/cmop/ClassEncapsulatedAttributes_test.t
+++ t/cmop/ClassEncapsulatedAttributes_test.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use File::Spec;
 
 use Class::MOP;
@@ -106,4 +106,4 @@ BEGIN {
     is($bar->SUPER_foo(), 'Foo::foo', '... got the right default value for Bar::SUPER::foo');
 }
 
-done_testing;
+#done_testing;
Index: t/cmop/Class_C3_compatibility.t
===================================================================
--- t.orig/cmop/Class_C3_compatibility.t
+++ t/cmop/Class_C3_compatibility.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 =pod
 
@@ -61,4 +61,4 @@ SKIP: {
     ok(defined &Diamond_D::hello, '... D does have an alias to the method hello');
 }
 
-done_testing;
+#done_testing;
Index: t/cmop/InsideOutClass_test.t
===================================================================
--- t.orig/cmop/InsideOutClass_test.t
+++ t/cmop/InsideOutClass_test.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use File::Spec;
 use Scalar::Util 'reftype';
 
@@ -221,4 +221,4 @@ is($baz->bling(), 'Baz::bling', '... Bar
     is(scalar(keys(%{'Bar::Baz::bling'})), 0, '... got the right number of entries for Bar::Baz::bling');
 }
 
-done_testing;
+#done_testing;
Index: t/cmop/InstanceCountingClass_test.t
===================================================================
--- t.orig/cmop/InstanceCountingClass_test.t
+++ t/cmop/InstanceCountingClass_test.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use File::Spec;
 
 use Class::MOP;
@@ -56,4 +56,4 @@ for (2 .. 10) {
 is(Foo->meta->get_count(), 10, '... our Foo count is now 10');
 is(Bar->meta->get_count(), 1, '... our Bar count is still 1');
 
-done_testing;
+#done_testing;
Index: t/cmop/LazyClass_test.t
===================================================================
--- t.orig/cmop/LazyClass_test.t
+++ t/cmop/LazyClass_test.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use File::Spec;
 
 use Class::MOP;
@@ -80,4 +80,4 @@ is($root->right->node(), 2, '... the rig
 ok(!exists($root->right->{'left'}), '... left attribute still has not been initialized yet');
 ok(!exists($root->right->{'right'}), '... right attribute still has not been initialized yet');
 
-done_testing;
+#done_testing;
Index: t/cmop/Perl6Attribute_test.t
===================================================================
--- t.orig/cmop/Perl6Attribute_test.t
+++ t/cmop/Perl6Attribute_test.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use File::Spec;
 
 use Class::MOP;
@@ -40,4 +40,4 @@ is($foo->foo, 42, '... Foo.foo == 42');
 is_deeply($foo->bar, [], '... Foo.bar == []');
 is_deeply($foo->baz, {}, '... Foo.baz == {}');
 
-done_testing;
+#done_testing;
Index: t/cmop/RT_27329_fix.t
===================================================================
--- t.orig/cmop/RT_27329_fix.t
+++ t/cmop/RT_27329_fix.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 use Class::MOP;
 
@@ -44,4 +44,4 @@ is($foo->get_foo, 'BAR', '... got the ri
     ok(!defined($clone->get_foo), '... got the right cloned value');
 }
 
-done_testing;
+#done_testing;
Index: t/cmop/RT_39001_fix.t
===================================================================
--- t.orig/cmop/RT_39001_fix.t
+++ t/cmop/RT_39001_fix.t
@@ -1,6 +1,6 @@
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -37,4 +37,4 @@ like( exception {
     Bar->meta->superclasses('Foo');
 }, qr/^Recursive inheritance detected/, "error occurs when Bar extends Foo, when Foo is a Bar" );
 
-done_testing;
+#done_testing;
Index: t/cmop/RT_41255.t
===================================================================
--- t.orig/cmop/RT_41255.t
+++ t/cmop/RT_41255.t
@@ -1,5 +1,5 @@
 use strict;
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -48,4 +48,4 @@ while (my ($name, $meta_method) = each %
     is( exception { $meta_method->execute }, undef );
 }
 
-done_testing;
+#done_testing;
Index: t/cmop/add_attribute_alternate.t
===================================================================
--- t.orig/cmop/add_attribute_alternate.t
+++ t/cmop/add_attribute_alternate.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -106,4 +106,4 @@ is($point3d->{'z'}, 3, '... the z attrib
 
 }
 
-done_testing;
+#done_testing;
Index: t/cmop/add_method_modifier.t
===================================================================
--- t.orig/cmop/add_method_modifier.t
+++ t/cmop/add_method_modifier.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -132,4 +132,4 @@ is( $checking_account->balance, 0,
 is( $savings_account->balance, 200,
     '... got the right savings balance after overdraft withdrawal' );
 
-done_testing;
+#done_testing;
Index: t/cmop/advanced_methods.t
===================================================================
--- t.orig/cmop/advanced_methods.t
+++ t/cmop/advanced_methods.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -150,4 +150,4 @@ is_deeply(
     ],
     '... got the right list of BUILD methods for Foo::Bar::Baz');
 
-done_testing;
+#done_testing;
Index: t/cmop/anon_class.t
===================================================================
--- t.orig/cmop/anon_class.t
+++ t/cmop/anon_class.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -65,4 +65,4 @@ isa_ok($instance_2, ('Class::MOP::Class:
 ok(!$instance_2->isa('Foo'), '... but the new instance is not a Foo');
 ok(!$instance_2->can('foo'), '... and it can no longer call the foo method');
 
-done_testing;
+#done_testing;
Index: t/cmop/anon_class_create_init.t
===================================================================
--- t.orig/cmop/anon_class_create_init.t
+++ t/cmop/anon_class_create_init.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -147,4 +147,4 @@ my $instance;
     ok(!$meta, "weak class is collected once instances go away");
 }
 
-done_testing;
+#done_testing;
Index: t/cmop/anon_class_keep_alive.t
===================================================================
--- t.orig/cmop/anon_class_keep_alive.t
+++ t/cmop/anon_class_keep_alive.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -51,4 +51,4 @@ is_deeply([$instance->meta->class_preced
           '... Anonymous instance has class precedence list',
          );
 
-done_testing;
+#done_testing;
Index: t/cmop/anon_class_leak.t
===================================================================
--- t.orig/cmop/anon_class_leak.t
+++ t/cmop/anon_class_leak.t
@@ -2,7 +2,7 @@ use strict;
 use warnings;
 
 use Class::MOP;
-use Test::More;
+use Test::More qw(no_plan);
 
 use Test::Requires {
     'Test::LeakTrace' => '0.01', # skip all if not installed
@@ -21,4 +21,4 @@ leaks_cmp_ok {
 }
 '<=', $expected, 'create_anon_class(superclass => [...])';
 
-done_testing;
+#done_testing;
Index: t/cmop/anon_packages.t
===================================================================
--- t.orig/cmop/anon_packages.t
+++ t/cmop/anon_packages.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 Class::MOP;
@@ -38,4 +38,4 @@ use Class::MOP;
          "can't cache anon packages");
 }
 
-done_testing;
+#done_testing;
Index: t/cmop/attribute.t
===================================================================
--- t.orig/cmop/attribute.t
+++ t/cmop/attribute.t
@@ -3,7 +3,7 @@ use warnings;
 
 use Scalar::Util 'reftype', 'blessed';
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -245,4 +245,4 @@ isnt( exception { Class::MOP::Attribute-
     is($attr->default(42), 42, 'passthrough for default on attribute');
 }
 
-done_testing;
+#done_testing;
Index: t/cmop/attribute_duplication.t
===================================================================
--- t.orig/cmop/attribute_duplication.t
+++ t/cmop/attribute_duplication.t
@@ -3,7 +3,7 @@ use warnings;
 
 use Scalar::Util;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 use Class::MOP;
 
@@ -55,4 +55,4 @@ one first.
     ::is($bar_attr2->reader, 'assign_bar', '... the bar attribute now has the reader assign_bar');
 }
 
-done_testing;
+#done_testing;
Index: t/cmop/attribute_errors_and_edge_cases.t
===================================================================
--- t.orig/cmop/attribute_errors_and_edge_cases.t
+++ t/cmop/attribute_errors_and_edge_cases.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -229,4 +229,4 @@ use Class::MOP::Attribute;
     }, undef, '... can create accessors with reader/writers' );
 }
 
-done_testing;
+#done_testing;
Index: t/cmop/attribute_get_read_write.t
===================================================================
--- t.orig/cmop/attribute_get_read_write.t
+++ t/cmop/attribute_get_read_write.t
@@ -3,7 +3,7 @@ use warnings;
 
 use Scalar::Util 'blessed', 'reftype';
 
-use Test::More;
+use Test::More qw(no_plan);
 
 use Class::MOP;
 
@@ -111,4 +111,4 @@ ok(!$gorch_attr->get_write_method, '...
     is($writer->fully_qualified_name, 'Foo::__ANON__', '... it is the sub we are looking for');
 }
 
-done_testing;
+#done_testing;
Index: t/cmop/attribute_initializer.t
===================================================================
--- t.orig/cmop/attribute_initializer.t
+++ t/cmop/attribute_initializer.t
@@ -3,7 +3,7 @@ use warnings;
 
 use Scalar::Util 'blessed', 'reftype';
 
-use Test::More;
+use Test::More qw(no_plan);
 
 use Class::MOP;
 
@@ -49,4 +49,4 @@ isa_ok($bar, 'Class::MOP::Attribute');
 ok($bar->has_initializer, '... bar has an initializer');
 is(reftype $bar->initializer, 'CODE', '... the initializer is a CODE ref');
 
-done_testing;
+#done_testing;
Index: t/cmop/attribute_introspection.t
===================================================================
--- t.orig/cmop/attribute_introspection.t
+++ t/cmop/attribute_introspection.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -130,4 +130,4 @@ use Class::MOP;
     # bored I will do it.
 }
 
-done_testing;
+#done_testing;
Index: t/cmop/attribute_non_alpha_name.t
===================================================================
--- t.orig/cmop/attribute_non_alpha_name.t
+++ t/cmop/attribute_non_alpha_name.t
@@ -3,7 +3,7 @@ use warnings;
 
 use Class::MOP;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 {
     package Foo;
@@ -31,4 +31,4 @@ use Test::More;
         unless $meta->is_immutable;
 }
 
-done_testing;
+#done_testing;
Index: t/cmop/attributes.t
===================================================================
--- t.orig/cmop/attributes.t
+++ t/cmop/attributes.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -259,4 +259,4 @@ for(1 .. 2){
   Buzz->meta->make_immutable();
 }
 
-done_testing;
+#done_testing;
Index: t/cmop/basic.t
===================================================================
--- t.orig/cmop/basic.t
+++ t/cmop/basic.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -77,4 +77,4 @@ is_deeply(
     [ 'Baz', 'Bar', 'Foo', 'UNIVERSAL' ],
     '... Baz->class_precedence_list == (Baz, Bar, Foo, UNIVERSAL)');
 
-done_testing;
+#done_testing;
Index: t/cmop/before_after_dollar_under.t
===================================================================
--- t.orig/cmop/before_after_dollar_under.t
+++ t/cmop/before_after_dollar_under.t
@@ -3,7 +3,7 @@ use warnings;
 
 use Class::MOP;
 use Class::MOP::Class;
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 my %results;
@@ -67,4 +67,4 @@ for my $wrap (qw(before after)) {
     );
 }
 
-done_testing;
+#done_testing;
Index: t/cmop/class_errors_and_edge_cases.t
===================================================================
--- t.orig/cmop/class_errors_and_edge_cases.t
+++ t/cmop/class_errors_and_edge_cases.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -220,4 +220,4 @@ use Class::MOP;
     }, undef, '... remove_package_symbol dies as expected' );
 }
 
-done_testing;
+#done_testing;
Index: t/cmop/class_is_pristine.t
===================================================================
--- t.orig/cmop/class_is_pristine.t
+++ t/cmop/class_is_pristine.t
@@ -2,7 +2,7 @@ use strict;
 use warnings;
 
 use Class::MOP;
-use Test::More;
+use Test::More qw(no_plan);
 
 {
     package Foo;
@@ -20,4 +20,4 @@ ok( $meta->is_pristine, 'Foo is still pr
 $meta->add_attribute( name => 'attr', reader => 'get_attr' );
 ok( ! $meta->is_pristine, 'Foo is not pristine after add_attribute' );
 
-done_testing;
+#done_testing;
Index: t/cmop/class_precedence_list.t
===================================================================
--- t.orig/cmop/class_precedence_list.t
+++ t/cmop/class_precedence_list.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 use Class::MOP;
 use Class::MOP::Class;
@@ -157,4 +157,4 @@ is_deeply(
     [ @CLASS_PRECEDENCE_LIST ],
     '... Foo::Bar::Baz->meta->class_precedence_list == @CLASS_PRECEDENCE_LIST');
 
-done_testing;
+#done_testing;
Index: t/cmop/constant_codeinfo.t
===================================================================
--- t.orig/cmop/constant_codeinfo.t
+++ t/cmop/constant_codeinfo.t
@@ -1,6 +1,6 @@
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 
 use Class::MOP;
 
@@ -19,4 +19,4 @@ undef $syms;
 $syms = $meta->get_all_package_symbols('CODE');
 is(ref $syms->{FOO}, 'CODE', 'constant symbol still there, although we dropped our reference');
 
-done_testing;
+#done_testing;
Index: t/cmop/create_class.t
===================================================================
--- t.orig/cmop/create_class.t
+++ t/cmop/create_class.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -110,4 +110,4 @@ is($point3d->{'z'}, 3, '... the z attrib
 
 }
 
-done_testing;
+#done_testing;
Index: t/cmop/custom_instance.t
===================================================================
--- t.orig/cmop/custom_instance.t
+++ t/cmop/custom_instance.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 Class::MOP;
@@ -135,4 +135,4 @@ like( exception { BadFoo::Sub->new }, qr
     }
 }
 
-done_testing;
+#done_testing;
Index: t/cmop/deprecated.t
===================================================================
--- t.orig/cmop/deprecated.t
+++ t/cmop/deprecated.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Carp;
@@ -70,4 +70,4 @@ $SIG{__WARN__} = \&croak;
     );
 }
 
-done_testing;
+#done_testing;
Index: t/cmop/get_code_info.t
===================================================================
--- t.orig/cmop/get_code_info.t
+++ t/cmop/get_code_info.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Sub::Name 'subname';
 
 BEGIN {
@@ -49,4 +49,4 @@ code_name_is( \&Class::MOP::Method::name
     sub foo : Bar {}
 }
 
-done_testing;
+#done_testing;
Index: t/cmop/immutable_custom_trait.t
===================================================================
--- t.orig/cmop/immutable_custom_trait.t
+++ t/cmop/immutable_custom_trait.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -73,4 +73,4 @@ use Class::MOP;
     );
 }
 
-done_testing;
+#done_testing;
Index: t/cmop/immutable_metaclass.t
===================================================================
--- t.orig/cmop/immutable_metaclass.t
+++ t/cmop/immutable_metaclass.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -295,4 +295,4 @@ use Class::MOP;
     );
 }
 
-done_testing;
+#done_testing;
Index: t/cmop/immutable_w_constructors.t
===================================================================
--- t.orig/cmop/immutable_w_constructors.t
+++ t/cmop/immutable_w_constructors.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -298,4 +298,4 @@ use Class::MOP;
 
 }
 
-done_testing;
+#done_testing;
Index: t/cmop/immutable_w_custom_metaclass.t
===================================================================
--- t.orig/cmop/immutable_w_custom_metaclass.t
+++ t/cmop/immutable_w_custom_metaclass.t
@@ -4,7 +4,7 @@ use warnings;
 use FindBin;
 use File::Spec::Functions;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 use Scalar::Util;
 
@@ -71,4 +71,4 @@ use lib catdir( $FindBin::Bin, 'lib' );
     ok( $meta->is_mutable, '... Baz is mutable again' );
 }
 
-done_testing;
+#done_testing;
Index: t/cmop/inline_and_dollar_at.t
===================================================================
--- t.orig/cmop/inline_and_dollar_at.t
+++ t/cmop/inline_and_dollar_at.t
@@ -1,6 +1,6 @@
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 use Class::MOP;
 
 
@@ -16,4 +16,4 @@ use Class::MOP;
     ::is( $@, 'dollar at', '$@ is untouched after immutablization' );
 }
 
-done_testing;
+#done_testing;
Index: t/cmop/inline_structor.t
===================================================================
--- t.orig/cmop/inline_structor.t
+++ t/cmop/inline_structor.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 use Test::Requires {
     'Test::Output' => '0.01', # skip all if not installed
@@ -291,4 +291,4 @@ use Class::MOP;
     );
 }
 
-done_testing;
+#done_testing;
Index: t/cmop/insertion_order.t
===================================================================
--- t.orig/cmop/insertion_order.t
+++ t/cmop/insertion_order.t
@@ -1,6 +1,6 @@
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 use Class::MOP;
 
 my $Point = Class::MOP::Class->create('Point' => (
@@ -32,4 +32,4 @@ my $Point = Class::MOP::Class->create('P
 is($Point->get_attribute('x')->insertion_order, 0, 'Insertion order of Attribute "x"');
 is($Point->get_attribute('y')->insertion_order, 1, 'Insertion order of Attribute "y"');
 
-done_testing;
+#done_testing;
Index: t/cmop/instance.t
===================================================================
--- t.orig/cmop/instance.t
+++ t/cmop/instance.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Scalar::Util qw/isweak reftype/;
@@ -136,4 +136,4 @@ ok(!$mi_foo->is_slot_initialized( $i_foo
 
 ok(!defined($mi_foo->get_slot_value( $i_foo, "moosen" )), "... no value for slot");
 
-done_testing;
+#done_testing;
Index: t/cmop/instance_inline.t
===================================================================
--- t.orig/cmop/instance_inline.t
+++ t/cmop/instance_inline.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP::Instance;
@@ -45,4 +45,4 @@ my $C = 'Class::MOP::Instance';
       '... got the right code for rebless_instance_structure');
 }
 
-done_testing;
+#done_testing;
Index: t/cmop/instance_metaclass_incompat.t
===================================================================
--- t.orig/cmop/instance_metaclass_incompat.t
+++ t/cmop/instance_metaclass_incompat.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 use metaclass;
 
@@ -63,4 +63,4 @@ eval {
 };
 ok(!$@, '... FooBar2.meta => FooBar::Meta is compatible') || diag $@;
 
-done_testing;
+#done_testing;
Index: t/cmop/instance_metaclass_incompat_dyn.t
===================================================================
--- t.orig/cmop/instance_metaclass_incompat_dyn.t
+++ t/cmop/instance_metaclass_incompat_dyn.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 use metaclass;
 
@@ -63,4 +63,4 @@ eval {
 };
 ok(!$@, '... FooBar2.meta => FooBar::Meta is compatible') || diag $@;
 
-done_testing;
+#done_testing;
Index: t/cmop/load.t
===================================================================
--- t.orig/cmop/load.t
+++ t/cmop/load.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 BEGIN {
     use_ok('Class::MOP');
@@ -150,4 +150,4 @@ is(
 
 isa_ok(Class::MOP::Class->meta, 'Class::MOP::Class');
 
-done_testing;
+#done_testing;
Index: t/cmop/load_class.t
===================================================================
--- t.orig/cmop/load_class.t
+++ t/cmop/load_class.t
@@ -4,7 +4,7 @@ use warnings;
 use FindBin;
 use File::Spec::Functions;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -173,4 +173,4 @@ like( exception {
 
 }
 
-done_testing;
+#done_testing;
Index: t/cmop/load_class_gvstash_detect_bug.t
===================================================================
--- t.orig/cmop/load_class_gvstash_detect_bug.t
+++ t/cmop/load_class_gvstash_detect_bug.t
@@ -4,7 +4,7 @@ use warnings;
 use FindBin;
 use File::Spec::Functions;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -25,4 +25,4 @@ is( exception {
     TestClassLoaded->a_method;
 }, undef );
 
-done_testing;
+#done_testing;
Index: t/cmop/magic.t
===================================================================
--- t.orig/cmop/magic.t
+++ t/cmop/magic.t
@@ -4,7 +4,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -72,4 +72,4 @@ use Tie::Scalar;
     }, undef );
 }
 
-done_testing;
+#done_testing;
Index: t/cmop/make_mutable.t
===================================================================
--- t.orig/cmop/make_mutable.t
+++ t/cmop/make_mutable.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Scalar::Util;
@@ -217,4 +217,4 @@ use Class::MOP;
     Bar->meta->make_mutable;
 }
 
-done_testing;
+#done_testing;
Index: t/cmop/meta_method.t
===================================================================
--- t.orig/cmop/meta_method.t
+++ t/cmop/meta_method.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 Class::MOP;
 
@@ -64,4 +64,4 @@ use Class::MOP;
     is( exception { $meta->class_precedence_list }, undef, "can do meta-level stuff" );
 }
 
-done_testing;
+#done_testing;
Index: t/cmop/meta_package.t
===================================================================
--- t.orig/cmop/meta_package.t
+++ t/cmop/meta_package.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -277,4 +277,4 @@ is(Foo->meta->get_package_symbol('@foo')
     );
 }
 
-done_testing;
+#done_testing;
Index: t/cmop/meta_package_extension.t
===================================================================
--- t.orig/cmop/meta_package_extension.t
+++ t/cmop/meta_package_extension.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -92,4 +92,4 @@ is( exception {
 
 ok(!defined($Foo::{baz}), '... the %baz slot has still not been created');
 
-done_testing;
+#done_testing;
Index: t/cmop/metaclass.t
===================================================================
--- t.orig/cmop/metaclass.t
+++ t/cmop/metaclass.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 use metaclass;
 
@@ -55,4 +55,4 @@ eval {
 };
 ok($@, '... metaclasses must be subclass of Class::MOP::Class');
 
-done_testing;
+#done_testing;
Index: t/cmop/metaclass_incompatibility.t
===================================================================
--- t.orig/cmop/metaclass_incompatibility.t
+++ t/cmop/metaclass_incompatibility.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use metaclass;
@@ -253,4 +253,4 @@ is( exception {
 is(Weird::Class::Sub->meta->destructor_class, 'Weird::Meta::Method::Destructor',
    "got the right destructor class");
 
-done_testing;
+#done_testing;
Index: t/cmop/metaclass_incompatibility_dyn.t
===================================================================
--- t.orig/cmop/metaclass_incompatibility_dyn.t
+++ t/cmop/metaclass_incompatibility_dyn.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 use metaclass;
 
@@ -63,4 +63,4 @@ eval {
 };
 ok(!$@, '... FooBar2.meta => FooBar::Meta is compatible') || diag $@;
 
-done_testing;
+#done_testing;
Index: t/cmop/metaclass_inheritance.t
===================================================================
--- t.orig/cmop/metaclass_inheritance.t
+++ t/cmop/metaclass_inheritance.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -42,4 +42,4 @@ is($baz_meta->name, 'Baz', '... baz_meta
 isnt($baz_meta, $bar_meta, '... Baz->meta != Bar->meta');
 isnt($baz_meta, $foo_meta, '... Baz->meta != Foo->meta');
 
-done_testing;
+#done_testing;
Index: t/cmop/metaclass_loads_classes.t
===================================================================
--- t.orig/cmop/metaclass_loads_classes.t
+++ t/cmop/metaclass_loads_classes.t
@@ -4,7 +4,7 @@ use warnings;
 use FindBin;
 use File::Spec::Functions;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 use Class::MOP;
 
@@ -38,4 +38,4 @@ ok(Class::MOP::is_class_loaded('MyMetaCl
 is($meta->method_metaclass,    'MyMetaClass::Method',  '... Correct method metaclass');
 ok(Class::MOP::is_class_loaded('MyMetaClass::Method'), '... method metaclass loaded');
 
-done_testing;
+#done_testing;
Index: t/cmop/metaclass_reinitialize.t
===================================================================
--- t.orig/cmop/metaclass_reinitialize.t
+++ t/cmop/metaclass_reinitialize.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 {
@@ -202,4 +202,4 @@ is($meta->get_method('foo')->foo, 'TEST'
 can_ok($meta->get_attribute('bar'), 'oof');
 is($meta->get_attribute('bar')->oof, 'TSET');
 
-done_testing;
+#done_testing;
Index: t/cmop/method.t
===================================================================
--- t.orig/cmop/method.t
+++ t/cmop/method.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -146,4 +146,4 @@ is($wrapped->name, '__ANON__', 'method n
 my $wrapped2 = Method::Subclass->wrap($method, foo => 'baz', name => 'FOO');
 is($wrapped2->name, 'FOO', 'got a new method name');
 
-done_testing;
+#done_testing;
Index: t/cmop/method_modifiers.t
===================================================================
--- t.orig/cmop/method_modifiers.t
+++ t/cmop/method_modifiers.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -200,4 +200,4 @@ use Class::MOP::Method;
                'check around_modifiers' );
 }
 
-done_testing;
+#done_testing;
Index: t/cmop/methods.t
===================================================================
--- t.orig/cmop/methods.t
+++ t/cmop/methods.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Scalar::Util qw/reftype/;
@@ -404,4 +404,4 @@ is_deeply(
 }
 
 
-done_testing;
+#done_testing;
Index: t/cmop/modify_parent_method.t
===================================================================
--- t.orig/cmop/modify_parent_method.t
+++ t/cmop/modify_parent_method.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -98,4 +98,4 @@ TODO: {
     );
 }
 
-done_testing;
+#done_testing;
Index: t/cmop/new_and_clone_metaclasses.t
===================================================================
--- t.orig/cmop/new_and_clone_metaclasses.t
+++ t/cmop/new_and_clone_metaclasses.t
@@ -4,7 +4,7 @@ use warnings;
 use FindBin;
 use File::Spec::Functions;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -124,4 +124,4 @@ is($attr->associated_class,
    $attr_clone->associated_class,
    '... we successfully did not clone our associated metaclass');
 
-done_testing;
+#done_testing;
Index: t/cmop/null_stash.t
===================================================================
--- t.orig/cmop/null_stash.t
+++ t/cmop/null_stash.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 
 use Class::MOP;
 my $non = Class::MOP::Class->initialize('Non::Existent::Package');
@@ -9,4 +9,4 @@ $non->get_method('foo');
 
 pass("empty stashes don't segfault");
 
-done_testing;
+#done_testing;
Index: t/cmop/numeric_defaults.t
===================================================================
--- t.orig/cmop/numeric_defaults.t
+++ t/cmop/numeric_defaults.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 use B;
 use Class::MOP;
 
@@ -122,4 +122,4 @@ for my $default (@string_defaults) {
     }
 }
 
-done_testing;
+#done_testing;
Index: t/cmop/package_variables.t
===================================================================
--- t.orig/cmop/package_variables.t
+++ t/cmop/package_variables.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -227,4 +227,4 @@ is(Foo->meta->get_package_symbol('@foo')
     ok(defined(*{"Foo::foo"}{ARRAY}), '... the @foo slot has NOT been removed');
 }
 
-done_testing;
+#done_testing;
Index: t/cmop/random_eval_bug.t
===================================================================
--- t.orig/cmop/random_eval_bug.t
+++ t/cmop/random_eval_bug.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 use Class::MOP;
 
@@ -47,4 +47,4 @@ eval {
 };
 ok( $@, '... we die correctly with bad args' );
 
-done_testing;
+#done_testing;
Index: t/cmop/rebless_instance.t
===================================================================
--- t.orig/cmop/rebless_instance.t
+++ t/cmop/rebless_instance.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 use Scalar::Util 'blessed';
 
@@ -92,4 +92,4 @@ ok($bar->meta->has_method('parent'), 'me
 
 is(blessed($bar->meta->new_object), 'Parent', 'new_object gives a Parent');
 
-done_testing;
+#done_testing;
Index: t/cmop/rebless_instance_away.t
===================================================================
--- t.orig/cmop/rebless_instance_away.t
+++ t/cmop/rebless_instance_away.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 use Class::MOP;
 
 my @calls;
@@ -42,4 +42,4 @@ is($calls[0][3], 'foo');
 is($calls[0][4], 1);
 splice @calls;
 
-done_testing;
+#done_testing;
Index: t/cmop/rebless_overload.t
===================================================================
--- t.orig/cmop/rebless_overload.t
+++ t/cmop/rebless_overload.t
@@ -1,6 +1,6 @@
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 use Class::MOP;
 
 do {
@@ -24,4 +24,4 @@ my $meta = Class::MOP::Class->initialize
 $meta->rebless_instance($without);
 is("$without", "overloaded", "overloading after reblessing works");
 
-done_testing;
+#done_testing;
Index: t/cmop/rebless_with_extra_params.t
===================================================================
--- t.orig/cmop/rebless_with_extra_params.t
+++ t/cmop/rebless_with_extra_params.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -92,4 +92,4 @@ use Class::MOP;
     ok(!exists($foo->{baz}), '... and the baz attribute was deinitialized');
 }
 
-done_testing;
+#done_testing;
Index: t/cmop/scala_style_mixin_composition.t
===================================================================
--- t.orig/cmop/scala_style_mixin_composition.t
+++ t/cmop/scala_style_mixin_composition.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 use Test::Requires {
     'SUPER' => 1.10, # skip all if not installed
@@ -170,4 +170,4 @@ is($colored_point_3d->toString(),
    'x = 1, y = 2, z = 3, col = blue',
    '... got the right toString method');
 
-done_testing;
+#done_testing;
Index: t/cmop/self_introspection.t
===================================================================
--- t.orig/cmop/self_introspection.t
+++ t/cmop/self_introspection.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -357,4 +357,4 @@ is($class_mop_class_meta->attribute_meta
 is($class_mop_class_meta->method_metaclass, 'Class::MOP::Method', '... got the right value for method_metaclass');
 is($class_mop_class_meta->instance_metaclass, 'Class::MOP::Instance', '... got the right value for instance_metaclass');
 
-done_testing;
+#done_testing;
Index: t/cmop/subclasses.t
===================================================================
--- t.orig/cmop/subclasses.t
+++ t/cmop/subclasses.t
@@ -1,6 +1,6 @@
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 use Class::MOP;
 
 do {
@@ -42,4 +42,4 @@ is_deeply([sort Son->meta->direct_subcla
 is_deeply([sort Daughter->meta->direct_subclasses],    []);
 is_deeply([sort Cousin->meta->direct_subclasses],      []);
 
-done_testing;
+#done_testing;
Index: t/cmop/subname.t
===================================================================
--- t.orig/cmop/subname.t
+++ t/cmop/subname.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 use Class::MOP;
 
@@ -39,4 +39,4 @@ is( Foo->bar, "Origin::bar", "caller agg
 
 is( Origin->bar, "Origin::bar", "unrelated class untouched" );
 
-done_testing;
+#done_testing;
Index: t/cmop/universal_methods.t
===================================================================
--- t.orig/cmop/universal_methods.t
+++ t/cmop/universal_methods.t
@@ -5,7 +5,7 @@ use warnings;
 
 # UNIVERSAL methods
 
-use Test::More;
+use Test::More qw(no_plan);
 use Class::MOP;
 
 my $meta_class = Class::MOP::Class->create_anon_class;
@@ -21,4 +21,4 @@ TODO: {
     }
 };
 
-done_testing;
+#done_testing;
Index: t/compat/composite_metaroles.t
===================================================================
--- t.orig/compat/composite_metaroles.t
+++ t/compat/composite_metaroles.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::Moose;
 
@@ -42,4 +42,4 @@ with_immutable {
     does_ok(Child->meta, 'Bar::Role');
 } 'Parent', 'Child';
 
-done_testing;
+#done_testing;
Index: t/compat/extends_nonmoose_that_isa_moose_with_metarole.t
===================================================================
--- t.orig/compat/extends_nonmoose_that_isa_moose_with_metarole.t
+++ t/compat/extends_nonmoose_that_isa_moose_with_metarole.t
@@ -1,6 +1,6 @@
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 use Class::MOP ();
 
 {
@@ -21,7 +21,7 @@ use Class::MOP ();
 {
     package SubSubClassUseBase;
     use Moose;
-    use Test::More;
+    use Test::More qw(no_plan);
     use Test::Fatal;
     is( exception {
         extends 'SubClassUseBase';
@@ -52,7 +52,7 @@ Class::MOP::remove_metaclass_by_name('Su
 {
     package MultiParent1;
     use Moose;
-    use Test::More;
+    use Test::More qw(no_plan);
     use Test::Fatal;
     is( exception {
         extends qw( SubClassUseBase OtherSubClassUseBase );
@@ -71,7 +71,7 @@ Class::MOP::remove_metaclass_by_name($_)
 {
     package MultiParent2;
     use Moose;
-    use Test::More;
+    use Test::More qw(no_plan);
     use Test::Fatal;
     is( exception {
         extends qw( OtherSubClassUseBase SubClassUseBase );
@@ -90,7 +90,7 @@ Class::MOP::remove_metaclass_by_name($_)
 {
     package MultiParent3;
     use Moose;
-    use Test::More;
+    use Test::More qw(no_plan);
     use Test::Fatal;
     is( exception {
         extends qw( OtherClass SubClassUseBase );
@@ -109,7 +109,7 @@ Class::MOP::remove_metaclass_by_name($_)
 {
     package MultiParent4;
     use Moose;
-    use Test::More;
+    use Test::More qw(no_plan);
     use Test::Fatal;
     is( exception {
         extends qw( SubClassUseBase OtherClass );
@@ -128,7 +128,7 @@ Class::MOP::remove_metaclass_by_name($_)
 {
     package MultiChild1;
     use Moose;
-    use Test::More;
+    use Test::More qw(no_plan);
     use Test::Fatal;
     is( exception {
         extends 'MultiParent1';
@@ -147,7 +147,7 @@ Class::MOP::remove_metaclass_by_name($_)
 {
     package MultiChild2;
     use Moose;
-    use Test::More;
+    use Test::More qw(no_plan);
     use Test::Fatal;
     is( exception {
         extends 'MultiParent2';
@@ -166,7 +166,7 @@ Class::MOP::remove_metaclass_by_name($_)
 {
     package MultiChild3;
     use Moose;
-    use Test::More;
+    use Test::More qw(no_plan);
     use Test::Fatal;
     is( exception {
         extends 'MultiParent3';
@@ -185,7 +185,7 @@ Class::MOP::remove_metaclass_by_name($_)
 {
     package MultiChild4;
     use Moose;
-    use Test::More;
+    use Test::More qw(no_plan);
     use Test::Fatal;
     is( exception {
         extends 'MultiParent4';
@@ -201,4 +201,4 @@ Class::MOP::remove_metaclass_by_name($_)
 Class::MOP::remove_metaclass_by_name($_)
     for qw( SubClassUseBase OtherSubClassUseBase );
 
-done_testing;
+#done_testing;
Index: t/compat/foreign_inheritence.t
===================================================================
--- t.orig/compat/foreign_inheritence.t
+++ t/compat/foreign_inheritence.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 
@@ -87,4 +87,4 @@ is( exception {
     SubClass2->meta->superclasses('MyBase');
 }, undef, 'Can subclass the same non-Moose class twice with different metaclasses' );
 
-done_testing;
+#done_testing;
Index: t/compat/module_refresh_compat.t
===================================================================
--- t.orig/compat/module_refresh_compat.t
+++ t/compat/module_refresh_compat.t
@@ -5,7 +5,7 @@ use warnings;
 
 use lib 't/lib', 'lib';
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use File::Spec;
@@ -89,4 +89,4 @@ ok(TestBaz->isa('Foo'), '... TestBaz is
 
 unlink $test_module_file;
 
-done_testing;
+#done_testing;
Index: t/compat/moose_respects_base.t
===================================================================
--- t.orig/compat/moose_respects_base.t
+++ t/compat/moose_respects_base.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 
 =pod
@@ -45,4 +45,4 @@ isa_ok($baz, 'Baz');
 isa_ok($baz, 'Foo');
 isa_ok($baz, 'Moose::Object');
 
-done_testing;
+#done_testing;
Index: t/examples/Child_Parent_attr_inherit.t
===================================================================
--- t.orig/examples/Child_Parent_attr_inherit.t
+++ t/examples/Child_Parent_attr_inherit.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 =pod
 
@@ -135,4 +135,4 @@ is( $orphan->last_name, $parent2->last_n
         . $parent2->last_name
         . ')' );
 
-done_testing;
+#done_testing;
Index: t/examples/example1.t
===================================================================
--- t.orig/examples/example1.t
+++ t/examples/example1.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 
 ## Roles
@@ -124,4 +124,4 @@ ok($at_least_10_chars->does('Constraint:
 ok(!defined($at_least_10_chars->validate('barrrrrrrrr')), '... validated correctly');
 is($at_least_10_chars->validate('bar'), 'must be at least 10 chars', '... validation failed correctly');
 
-done_testing;
+#done_testing;
Index: t/examples/example2.t
===================================================================
--- t.orig/examples/example2.t
+++ t/examples/example2.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 sub U {
@@ -154,4 +154,4 @@ sub Y {
     is($coll2->print, '1, 4, 9, 16, 25, 36, 49, 64, 81, 100', '... new collection is changed');
 }
 
-done_testing;
+#done_testing;
Index: t/examples/example_Moose_POOP.t
===================================================================
--- t.orig/examples/example_Moose_POOP.t
+++ t/examples/example_Moose_POOP.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 use Test::Requires {
     'DBM::Deep' => '1.0003', # skip all if not installed
@@ -434,4 +434,4 @@ MooseX::POOP::Meta::Instance->_reload_db
 
 }
 
-done_testing;
+#done_testing;
Index: t/examples/example_Protomoose.t
===================================================================
--- t.orig/examples/example_Protomoose.t
+++ t/examples/example_Protomoose.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 =pod
 
@@ -280,4 +280,4 @@ is($foo->bar, 300, '... still got the or
 is(Foo->bar, 100, '... still got the original value stored in the prototype (through the Foo class)');
 is(Bar->bar, 100, '... still got the original value stored in the prototype (through the Bar class)');
 
-done_testing;
+#done_testing;
Index: t/examples/example_w_DCS.t
===================================================================
--- t.orig/examples/example_w_DCS.t
+++ t/examples/example_w_DCS.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 =pod
 
@@ -89,4 +89,4 @@ isnt( exception {
     $foo->baz({});
 }, undef, '... validation failed correctly' );
 
-done_testing;
+#done_testing;
Index: t/examples/example_w_TestDeep.t
===================================================================
--- t.orig/examples/example_w_TestDeep.t
+++ t/examples/example_w_TestDeep.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 =pod
 
@@ -73,4 +73,4 @@ isnt( exception {
     $foo->bar([{ foo => 3 }]);
 }, undef, '... validation failed correctly' );
 
-done_testing;
+#done_testing;
Index: t/examples/record_set_iterator.t
===================================================================
--- t.orig/examples/record_set_iterator.t
+++ t/examples/record_set_iterator.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 
 {
@@ -113,4 +113,4 @@ $rsi->get_next_record;
 is($rsi->first_name, 'Jim', '... got the right first name');
 is($rsi->last_name, 'Johnson', '... got the right last name');
 
-done_testing;
+#done_testing;
Index: t/immutable/apply_roles_to_immutable.t
===================================================================
--- t.orig/immutable/apply_roles_to_immutable.t
+++ t/immutable/apply_roles_to_immutable.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 
@@ -37,4 +37,4 @@ is( exception {
 
 is($foo->baz, 'My::Role::baz(Foo::baz)', '... got the right value');
 
-done_testing;
+#done_testing;
Index: t/immutable/buildargs.t
===================================================================
--- t.orig/immutable/buildargs.t
+++ t/immutable/buildargs.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 {
     package Foo;
@@ -44,4 +44,4 @@ foreach my $class qw(Foo Bar) {
     }
 }
 
-done_testing;
+#done_testing;
Index: t/immutable/constructor_is_not_moose.t
===================================================================
--- t.orig/immutable/constructor_is_not_moose.t
+++ t/immutable/constructor_is_not_moose.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 use Test::Requires {
     'Test::Output' => '0.01', # skip all if not installed
@@ -102,4 +102,4 @@ is(
     );
 }
 
-done_testing;
+#done_testing;
Index: t/immutable/constructor_is_wrapped.t
===================================================================
--- t.orig/immutable/constructor_is_wrapped.t
+++ t/immutable/constructor_is_wrapped.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 use Test::Requires {
     'Test::Output' => '0.01', # skip all if not installed
@@ -29,4 +29,4 @@ use Test::Requires {
     );
 }
 
-done_testing;
+#done_testing;
Index: t/immutable/default_values.t
===================================================================
--- t.orig/immutable/default_values.t
+++ t/immutable/default_values.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 {
@@ -78,4 +78,4 @@ is( $bar->buz, q{"'\\},
 is( $bar->faz, qq{\0},
     'default value for faz attr' );
 
-done_testing;
+#done_testing;
Index: t/immutable/definition_context.t
===================================================================
--- t.orig/immutable/definition_context.t
+++ t/immutable/definition_context.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;
 
 {
@@ -80,4 +80,4 @@ use Test::Fatal;
     }
 }
 
-done_testing;
+#done_testing;
Index: t/immutable/immutable_constructor_error.t
===================================================================
--- t.orig/immutable/immutable_constructor_error.t
+++ t/immutable/immutable_constructor_error.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 
@@ -29,4 +29,4 @@ like( exception { Foo->new($scalar) }, q
 like( exception { Foo->new(\$scalar) }, qr/\QSingle parameters to new() must be a HASH ref/, 'Scalar ref provided to immutable constructor gives useful error message' );
 like( exception { Foo->new(undef) }, qr/\QSingle parameters to new() must be a HASH ref/, 'undef provided to immutable constructor gives useful error message' );
 
-done_testing;
+#done_testing;
Index: t/immutable/immutable_destroy.t
===================================================================
--- t.orig/immutable/immutable_destroy.t
+++ t/immutable/immutable_destroy.t
@@ -1,6 +1,6 @@
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 
 {
     package FooBar;
@@ -18,4 +18,4 @@ my $f = FooBar->new( name => 'SUSAN' );
 
 is( $f->DESTROY, 'SUSAN', 'Did moose overload DESTROY?' );
 
-done_testing;
+#done_testing;
Index: t/immutable/immutable_meta_class.t
===================================================================
--- t.orig/immutable/immutable_meta_class.t
+++ t/immutable/immutable_meta_class.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 
@@ -24,4 +24,4 @@ is( exception {
     My::Meta->meta()->make_immutable(debug => 0)
 }, undef, '... can make a meta class immutable' );
 
-done_testing;
+#done_testing;
Index: t/immutable/immutable_metaclass_with_traits.t
===================================================================
--- t.orig/immutable/immutable_metaclass_with_traits.t
+++ t/immutable/immutable_metaclass_with_traits.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 
 {
     package FooTrait;
@@ -34,4 +34,4 @@ is(Class::MOP::class_of($meta), $meta->m
 isa_ok(Class::MOP::class_of($meta), 'Moose::Meta::Class');
 ok($meta->meta->does_role('FooTrait'), "still does the trait after immutable");
 
-done_testing;
+#done_testing;
Index: t/immutable/immutable_moose.t
===================================================================
--- t.orig/immutable/immutable_moose.t
+++ t/immutable/immutable_moose.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Moose::Meta::Role;
@@ -83,4 +83,4 @@ Nothing here yet, but soon :)
 
 =cut
 
-done_testing;
+#done_testing;
Index: t/immutable/immutable_roundtrip.t
===================================================================
--- t.orig/immutable/immutable_roundtrip.t
+++ t/immutable/immutable_roundtrip.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 use Test::Requires {
     'Test::Output' => '0.01', # skip all if not installed
@@ -35,4 +35,4 @@ use Test::Requires {
     );
 }
 
-done_testing;
+#done_testing;
Index: t/immutable/immutable_trigger_from_constructor.t
===================================================================
--- t.orig/immutable/immutable_trigger_from_constructor.t
+++ t/immutable/immutable_trigger_from_constructor.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 
@@ -35,4 +35,4 @@ like ($@, qr/^Pulling the Baz trigger/,
 
 is( exception { AClass->new(bar => 'bar') }, undef, '... no triggers called' );
 
-done_testing;
+#done_testing;
Index: t/immutable/inline_fallbacks.t
===================================================================
--- t.orig/immutable/inline_fallbacks.t
+++ t/immutable/inline_fallbacks.t
@@ -1,6 +1,6 @@
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 
 {
     package Foo;
@@ -67,4 +67,4 @@ Bar->meta->make_immutable;
 Bar::Sub2->new;
 is($BAR, 1, 'DEMOLISH in subclass was called');
 
-done_testing;
+#done_testing;
Index: t/immutable/inlined_constructors_n_types.t
===================================================================
--- t.orig/immutable/inlined_constructors_n_types.t
+++ t/immutable/inlined_constructors_n_types.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 =pod
@@ -59,4 +59,4 @@ for (1..2) {
     Foo->meta->make_immutable(debug => 0) unless $is_immutable;
 }
 
-done_testing;
+#done_testing;
Index: t/immutable/multiple_demolish_inline.t
===================================================================
--- t.orig/immutable/multiple_demolish_inline.t
+++ t/immutable/multiple_demolish_inline.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 
@@ -44,4 +44,4 @@ is( exception {
 is( Foo->meta->get_method('DESTROY')->package_name, 'Foo',
     'Foo has a DESTROY method in the Bar class (not inherited)' );
 
-done_testing;
+#done_testing;
Index: t/metaclasses/create_anon_with_required_attr.t
===================================================================
--- t.orig/metaclasses/create_anon_with_required_attr.t
+++ t/metaclasses/create_anon_with_required_attr.t
@@ -6,7 +6,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 {
@@ -85,4 +85,4 @@ isnt( exception {
     die $@ if $@;
 }, undef, 'failed to use trait without required attr' );
 
-done_testing;
+#done_testing;
Index: t/metaclasses/custom_attr_meta_as_role.t
===================================================================
--- t.orig/metaclasses/custom_attr_meta_as_role.t
+++ t/metaclasses/custom_attr_meta_as_role.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 is( exception {
@@ -19,4 +19,4 @@ is( exception {
     with 'MooseX::Attribute::Test';
 }, undef, 'custom attribute metaclass extending role is okay' );
 
-done_testing;
+#done_testing;
Index: t/metaclasses/custom_attr_meta_with_roles.t
===================================================================
--- t.orig/metaclasses/custom_attr_meta_with_roles.t
+++ t/metaclasses/custom_attr_meta_with_roles.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 
 {
@@ -38,4 +38,4 @@ ok($c->meta->has_attribute('bling_bling'
 
 isa_ok($c->meta->get_attribute('bling_bling'), 'My::Custom::Meta::Attr');
 
-done_testing;
+#done_testing;
Index: t/metaclasses/easy_init_meta.t
===================================================================
--- t.orig/metaclasses/easy_init_meta.t
+++ t/metaclasses/easy_init_meta.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Moose qw(does_ok);
 
 {
@@ -125,4 +125,4 @@ use Test::Moose qw(does_ok);
     ::does_ok(Foo2::Role->meta, 'Foo::Trait::Class');
 }
 
-done_testing;
+#done_testing;
Index: t/metaclasses/export_with_prototype.t
===================================================================
--- t.orig/metaclasses/export_with_prototype.t
+++ t/metaclasses/export_with_prototype.t
@@ -2,7 +2,7 @@ use lib "t/lib";
 package MyExporter::User;
 use MyExporter;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 is( exception {
@@ -19,4 +19,4 @@ is( exception {
     };
 }, undef, "check function with prototype" );
 
-done_testing;
+#done_testing;
Index: t/metaclasses/extending_and_embedding_back_compat.t
===================================================================
--- t.orig/metaclasses/extending_and_embedding_back_compat.t
+++ t/metaclasses/extending_and_embedding_back_compat.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 
 BEGIN {
@@ -52,4 +52,4 @@ isa_ok($obj, 'Moose::Object');
 
 is($obj->foo, 10, '... got the right value');
 
-done_testing;
+#done_testing;
Index: t/metaclasses/goto_moose_import.t
===================================================================
--- t.orig/metaclasses/goto_moose_import.t
+++ t/metaclasses/goto_moose_import.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 # Some packages out in the wild cooperate with Moose by using goto
@@ -79,4 +79,4 @@ ok( Bar->can('meta'),
     'Bar has a meta method' );
 isa_ok( Bar->meta(), 'Moose::Meta::Class' );
 
-done_testing;
+#done_testing;
Index: t/metaclasses/immutable_metaclass_compat_bug.t
===================================================================
--- t.orig/metaclasses/immutable_metaclass_compat_bug.t
+++ t/metaclasses/immutable_metaclass_compat_bug.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 
 {
     package Foo::Base::Meta::Trait;
@@ -35,4 +35,4 @@ use Test::More;
     ::ok(!Foo->meta->is_immutable);
 }
 
-done_testing;
+#done_testing;
Index: t/metaclasses/meta_name.t
===================================================================
--- t.orig/metaclasses/meta_name.t
+++ t/metaclasses/meta_name.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 
 {
     # so we don't pick up stuff from Moose::Object
@@ -40,4 +40,4 @@ ok(!Baz->can('meta'));
 # 1 because of the dummy method we installed in Base
 is(scalar Class::MOP::class_of('Baz')->get_all_methods, 1);
 
-done_testing;
+#done_testing;
Index: t/metaclasses/metaclass_compat.t
===================================================================
--- t.orig/metaclasses/metaclass_compat.t
+++ t/metaclasses/metaclass_compat.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;
 
 our $called = 0;
@@ -302,4 +302,4 @@ ok(Foo::Sub->meta->meta->can('does_role'
     ::is( ::exception { extends 'Foo7' }, undef, "role reconciliation works" );
 }
 
-done_testing;
+#done_testing;
Index: t/metaclasses/metaclass_compat_no_fixing_bug.t
===================================================================
--- t.orig/metaclasses/metaclass_compat_no_fixing_bug.t
+++ t/metaclasses/metaclass_compat_no_fixing_bug.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;
 
 {
@@ -43,4 +43,4 @@ use Test::Fatal;
     ::is( ::exception { extends 'Foo::Sub' }, undef, "doesn't try to fix if nothing is needed" );
 }
 
-done_testing;
+#done_testing;
Index: t/metaclasses/metaclass_parameterized_traits.t
===================================================================
--- t.orig/metaclasses/metaclass_parameterized_traits.t
+++ t/metaclasses/metaclass_parameterized_traits.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 
 {
     package My::Trait;
@@ -45,4 +45,4 @@ is($other_meta->reversed, 'ssalC::rehtO:
 ok(!$other_meta->can('enam'), "the method was not installed under the other class' alias");
 ok(!$other_meta->can('reversed_name'), "the method was not installed under the original name when that was excluded");
 
-done_testing;
+#done_testing;
Index: t/metaclasses/metaclass_traits.t
===================================================================
--- t.orig/metaclasses/metaclass_traits.t
+++ t/metaclasses/metaclass_traits.t
@@ -5,7 +5,7 @@ use warnings;
 
 use lib 't/lib', 'lib';
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 {
@@ -223,4 +223,4 @@ is( exception {
     is( $instance->an_attr, 'value', 'Can get value' );
 }, undef, 'Can create instance and access attributes' );
 
-done_testing;
+#done_testing;
Index: t/metaclasses/metarole.t
===================================================================
--- t.orig/metaclasses/metarole.t
+++ t/metaclasses/metarole.t
@@ -5,7 +5,7 @@ use warnings;
 
 use lib 't/lib', 'lib';
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Moose::Util::MetaRole;
@@ -724,4 +724,4 @@ is( exception {
     );
 }
 
-done_testing;
+#done_testing;
Index: t/metaclasses/metarole_backcompat.t
===================================================================
--- t.orig/metaclasses/metarole_backcompat.t
+++ t/metaclasses/metarole_backcompat.t
@@ -8,7 +8,7 @@ use warnings;
 
 use lib 't/lib', 'lib';
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Moose::Util::MetaRole;
@@ -668,4 +668,4 @@ is( exception {
     );
 }
 
-done_testing;
+#done_testing;
Index: t/metaclasses/metarole_combination.t
===================================================================
--- t.orig/metaclasses/metarole_combination.t
+++ t/metaclasses/metarole_combination.t
@@ -1,6 +1,6 @@
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 
 our @applications;
 
@@ -235,4 +235,4 @@ is_deeply( [My::Role::Special->meta->com
     ::ok( $applications[1]->[1]->name->isa('Garply') );
 }
 
-done_testing;
+#done_testing;
Index: t/metaclasses/metarole_on_anon.t
===================================================================
--- t.orig/metaclasses/metarole_on_anon.t
+++ t/metaclasses/metarole_on_anon.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 use Moose ();
 use Moose::Meta::Class;
@@ -48,4 +48,4 @@ BAIL_OUT('Cannot continue if the anon cl
 my $meta = $anon_name->meta;
 ok( $meta, 'cached anon class still has a metaclass applying a metarole' );
 
-done_testing;
+#done_testing;
Index: t/metaclasses/metarole_w_metaclass_pm.t
===================================================================
--- t.orig/metaclasses/metarole_w_metaclass_pm.t
+++ t/metaclasses/metarole_w_metaclass_pm.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 use Moose::Util::MetaRole;
 
@@ -110,4 +110,4 @@ sub has_superclass {
     ok( $supers{$parent}, $desc );
 }
 
-done_testing;
+#done_testing;
Index: t/metaclasses/metaroles_of_metaroles.t
===================================================================
--- t.orig/metaclasses/metaroles_of_metaroles.t
+++ t/metaclasses/metaroles_of_metaroles.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;
 
 {
@@ -65,4 +65,4 @@ use Test::Fatal;
          "apply a meta role to a role, which is then applied to yet another role");
 }
 
-done_testing;
+#done_testing;
Index: t/metaclasses/moose_exporter.t
===================================================================
--- t.orig/metaclasses/moose_exporter.t
+++ t/metaclasses/moose_exporter.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Test::Requires {
@@ -416,4 +416,4 @@ use Test::Requires {
         for qw( with_meta1 with_meta2 with_caller1 with_caller2 as_is1 );
 }
 
-done_testing;
+#done_testing;
Index: t/metaclasses/moose_exporter_trait_aliases.t
===================================================================
--- t.orig/metaclasses/moose_exporter_trait_aliases.t
+++ t/metaclasses/moose_exporter_trait_aliases.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Moose;
 
 {
@@ -86,4 +86,4 @@ BEGIN {
     }
 }
 
-done_testing;
+#done_testing;
Index: t/metaclasses/moose_for_meta.t
===================================================================
--- t.orig/metaclasses/moose_for_meta.t
+++ t/metaclasses/moose_for_meta.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 
 =pod
@@ -75,4 +75,4 @@ is_deeply(
     ok($attr->has_accessor, '... the attribute does have an accessor (as expected)');
 }
 
-done_testing;
+#done_testing;
Index: t/metaclasses/moose_nonmoose_metatrait_init_order.t
===================================================================
--- t.orig/metaclasses/moose_nonmoose_metatrait_init_order.t
+++ t/metaclasses/moose_nonmoose_metatrait_init_order.t
@@ -17,7 +17,7 @@ use warnings;
     use base qw/SubClassUseBase/;
 }
 
-use Test::More;
+use Test::More qw(no_plan);
 use Moose::Util qw/find_meta does_role/;
 
 my $subsubclass_meta = Moose->init_meta( for_class => 'SubSubClassUseBase' );
@@ -27,4 +27,4 @@ my $subclass_meta = find_meta('SubClassU
 ok does_role($subclass_meta, 'My::Role'),
     'SubClass metaclass does role from parent metaclass';
 
-done_testing;
+#done_testing;
Index: t/metaclasses/moose_nonmoose_moose_chain_init_meta.t
===================================================================
--- t.orig/metaclasses/moose_nonmoose_moose_chain_init_meta.t
+++ t/metaclasses/moose_nonmoose_moose_chain_init_meta.t
@@ -14,11 +14,11 @@ use warnings;
     use Moose;
 }
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 is( exception {
     Moose->init_meta(for_class => 'SomeClass');
 }, undef, 'Moose class => use base => Moose Class, then Moose->init_meta on middle class ok' );
 
-done_testing;
+#done_testing;
Index: t/metaclasses/moose_w_metaclass.t
===================================================================
--- t.orig/metaclasses/moose_w_metaclass.t
+++ t/metaclasses/moose_w_metaclass.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 
 =pod
@@ -53,4 +53,4 @@ isa_ok(Foo->meta, 'Foo::Meta');
         '... got the right error too');
 }
 
-done_testing;
+#done_testing;
Index: t/metaclasses/new_metaclass.t
===================================================================
--- t.orig/metaclasses/new_metaclass.t
+++ t/metaclasses/new_metaclass.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 
 do {
     package My::Meta::Class;
@@ -25,4 +25,4 @@ do {
 is(My::Class->meta->meta->name, 'My::Meta::Class');
 is(My::Class::Aliased->meta->meta->name, 'My::Meta::Class');
 
-done_testing;
+#done_testing;
Index: t/metaclasses/new_object_BUILD.t
===================================================================
--- t.orig/metaclasses/new_object_BUILD.t
+++ t/metaclasses/new_object_BUILD.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 
 my $called;
 {
@@ -17,4 +17,4 @@ $called = 0;
 Foo->meta->new_object;
 is($called, 1, "BUILD called from ->meta->new_object");
 
-done_testing;
+#done_testing;
Index: t/metaclasses/reinitialize.t
===================================================================
--- t.orig/metaclasses/reinitialize.t
+++ t/metaclasses/reinitialize.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Moose;
 use Test::Fatal;
 
@@ -318,4 +318,4 @@ Moose::Meta::Role->reinitialize('Role3')
 ok( Role3->meta->does_role('Role1'), 'Role3 does Role1 after reinitialize' );
 ok( Role3->meta->does_role('Role2'), 'Role3 does Role2 after reinitialize' );
 
-done_testing;
+#done_testing;
Index: t/metaclasses/throw_error.t
===================================================================
--- t.orig/metaclasses/throw_error.t
+++ t/metaclasses/throw_error.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 {
@@ -229,4 +229,4 @@ is($confess->meta->error_class, 'Moose::
     stacktrace_ok { $confess->bar };
 }
 
-done_testing;
+#done_testing;
Index: t/metaclasses/use_base_of_moose.t
===================================================================
--- t.orig/metaclasses/use_base_of_moose.t
+++ t/metaclasses/use_base_of_moose.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 {
     package NoOpTrait;
@@ -35,4 +35,4 @@ is($child->attr, "ibute", "getter inheri
 $child->attr("ition");
 is($child->attr, "ition", "setter inherited properly");
 
-done_testing;
+#done_testing;
Index: t/moose_util/apply_roles.t
===================================================================
--- t.orig/moose_util/apply_roles.t
+++ t/moose_util/apply_roles.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Moose::Util qw( apply_all_roles );
 
 {
@@ -68,4 +68,4 @@ ok( Class::A->meta->does_role($_),
     "Class::E does $_ (mix of names and meta role object)" )
     for @roles;
 
-done_testing;
+#done_testing;
Index: t/moose_util/create_alias.t
===================================================================
--- t.orig/moose_util/create_alias.t
+++ t/moose_util/create_alias.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Moose qw(does_ok);
 
 BEGIN {
@@ -101,4 +101,4 @@ isa_ok($bwmc_meta->get_attribute('bar'),
 does_ok($bwmt_meta, 'Bar::Meta::Role');
 does_ok($bwmt_meta->get_attribute('bar'), 'Bar::Meta::Role::Attribute');
 
-done_testing;
+#done_testing;
Index: t/moose_util/ensure_all_roles.t
===================================================================
--- t.orig/moose_util/ensure_all_roles.t
+++ t/moose_util/ensure_all_roles.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 BEGIN {
     use_ok('Moose::Util', ':all');
@@ -63,4 +63,4 @@ is_deeply(
     "unchanged, since all roles are already applied",
 );
 
-done_testing;
+#done_testing;
Index: t/moose_util/method_mod_args.t
===================================================================
--- t.orig/moose_util/method_mod_args.t
+++ t/moose_util/method_mod_args.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 use Moose::Util qw( add_method_modifier );
 
@@ -28,4 +28,4 @@ $foo->bar;
 is($COUNT, 2, "checking that the modifiers were installed.");
 
 
-done_testing;
+#done_testing;
Index: t/moose_util/moose_util.t
===================================================================
--- t.orig/moose_util/moose_util.t
+++ t/moose_util/moose_util.t
@@ -3,10 +3,10 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 BEGIN {
     use_ok('Moose::Util');
 }
 
-done_testing;
+#done_testing;
Index: t/moose_util/moose_util_does_role.t
===================================================================
--- t.orig/moose_util/moose_util_does_role.t
+++ t/moose_util/moose_util_does_role.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 BEGIN {
     use_ok('Moose::Util', ':all');
@@ -79,4 +79,4 @@ ok(!does_role('Quux', 'Foo'), '... Quux
 
 #ok(does_role('Foo::Foo', 'Foo'), '... Foo::Foo does do Foo');
 
-done_testing;
+#done_testing;
Index: t/moose_util/moose_util_search_class_by_role.t
===================================================================
--- t.orig/moose_util/moose_util_search_class_by_role.t
+++ t/moose_util/moose_util_search_class_by_role.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 BEGIN {
     use_ok('Moose::Util', ':all');
@@ -42,4 +42,4 @@ is search_class_by_role('SCBR::C', SCBR:
 is search_class_by_role('SCBR::D', 'SCBR::Role'), 'SCBR::D', '... nearest class being direct class returned';
 is search_class_by_role('SCBR::D', SCBR::Role->meta), 'SCBR::D', '... nearest class being direct class returned';
 
-done_testing;
+#done_testing;
Index: t/moose_util/resolve_alias.t
===================================================================
--- t.orig/moose_util/resolve_alias.t
+++ t/moose_util/resolve_alias.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 use Moose::Util qw( resolve_metaclass_alias resolve_metatrait_alias );
 
@@ -76,4 +76,4 @@ is( resolve_metatrait_alias( 'Attribute'
     'My::Trait::Bar',
     'resolve_metatrait_alias finds Moose::Meta::Attribute::Custom::Trait::Bar as My::Trait::Bar via alias (Bar) a second time' );
 
-done_testing;
+#done_testing;
Index: t/moose_util/with_traits.t
===================================================================
--- t.orig/moose_util/with_traits.t
+++ t/moose_util/with_traits.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Moose;
 
 use Moose ();
@@ -48,4 +48,4 @@ use Moose::Util qw(with_traits);
     is($traited_class, $traited_class2, "get the same class back when passing the same roles");
 }
 
-done_testing;
+#done_testing;
Index: t/native_traits/array_coerce.t
===================================================================
--- t.orig/native_traits/array_coerce.t
+++ t/native_traits/array_coerce.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 {
@@ -233,4 +233,4 @@ my $foo = Foo->new;
     );
 }
 
-done_testing;
+#done_testing;
Index: t/native_traits/array_from_role.t
===================================================================
--- t.orig/native_traits/array_from_role.t
+++ t/native_traits/array_from_role.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 {
@@ -43,4 +43,4 @@ use Test::Fatal;
         }, undef, '... this should work correctly' );
 }
 
-done_testing;
+#done_testing;
Index: t/native_traits/array_subtypes.t
===================================================================
--- t.orig/native_traits/array_subtypes.t
+++ t/native_traits/array_subtypes.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;
 
 {
@@ -262,4 +262,4 @@ my $foo = Foo->new;
     );
 }
 
-done_testing;
+#done_testing;
Index: t/native_traits/array_trigger.t
===================================================================
--- t.orig/native_traits/array_trigger.t
+++ t/native_traits/array_trigger.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 {
     package Foo;
@@ -50,4 +50,4 @@ my $foo = Foo->new;
     );
 }
 
-done_testing;
+#done_testing;
Index: t/native_traits/collection_with_roles.t
===================================================================
--- t.orig/native_traits/collection_with_roles.t
+++ t/native_traits/collection_with_roles.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 {
     package Subject;
@@ -66,7 +66,7 @@ use Test::More;
 
     package Display;
 
-    use Test::More;
+    use Test::More qw(no_plan);
 
     use Moose;
 
@@ -121,4 +121,4 @@ $count->inc_counter;
 
 is( $count->count, 0, 'Back to zero' );
 
-done_testing;
+#done_testing;
Index: t/native_traits/custom_instance.t
===================================================================
--- t.orig/native_traits/custom_instance.t
+++ t/native_traits/custom_instance.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::Moose;
 
@@ -244,4 +244,4 @@ with_immutable {
     }
 } 'Foo';
 
-done_testing;
+#done_testing;
Index: t/native_traits/hash_coerce.t
===================================================================
--- t.orig/native_traits/hash_coerce.t
+++ t/native_traits/hash_coerce.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 {
 
@@ -145,4 +145,4 @@ my $foo = Foo->new;
 }
 
 
-done_testing;
+#done_testing;
Index: t/native_traits/hash_subtypes.t
===================================================================
--- t.orig/native_traits/hash_subtypes.t
+++ t/native_traits/hash_subtypes.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 {
@@ -203,4 +203,4 @@ my $foo = Foo->new;
     );
 }
 
-done_testing;
+#done_testing;
Index: t/native_traits/hash_trigger.t
===================================================================
--- t.orig/native_traits/hash_trigger.t
+++ t/native_traits/hash_trigger.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 {
 
@@ -51,4 +51,4 @@ my $foo = Foo->new;
     );
 }
 
-done_testing;
+#done_testing;
Index: t/native_traits/remove_attribute.t
===================================================================
--- t.orig/native_traits/remove_attribute.t
+++ t/native_traits/remove_attribute.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 {
@@ -47,4 +47,4 @@ ok( !$page->can($_), "... our class no l
     reset_counter
 ];
 
-done_testing;
+#done_testing;
Index: t/native_traits/trait_array.t
===================================================================
--- t.orig/native_traits/trait_array.t
+++ t/native_traits/trait_array.t
@@ -8,7 +8,7 @@ use lib 't/lib';
 use Moose ();
 use Moose::Util::TypeConstraints;
 use NoInlineAttribute;
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 use Test::Moose;
 
@@ -669,4 +669,4 @@ sub run_tests {
     $class;
 }
 
-done_testing;
+#done_testing;
Index: t/native_traits/trait_bool.t
===================================================================
--- t.orig/native_traits/trait_bool.t
+++ t/native_traits/trait_bool.t
@@ -8,7 +8,7 @@ use lib 't/lib';
 use Moose ();
 use Moose::Util::TypeConstraints;
 use NoInlineAttribute;
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 use Test::Moose;
 
@@ -100,4 +100,4 @@ sub run_tests {
     $class;
 }
 
-done_testing;
+#done_testing;
Index: t/native_traits/trait_code.t
===================================================================
--- t.orig/native_traits/trait_code.t
+++ t/native_traits/trait_code.t
@@ -5,7 +5,7 @@ use lib 't/lib';
 
 use Moose ();
 use NoInlineAttribute;
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Moose;
 
 {
@@ -110,4 +110,4 @@ sub run_tests {
     $class;
 }
 
-done_testing;
+#done_testing;
Index: t/native_traits/trait_counter.t
===================================================================
--- t.orig/native_traits/trait_counter.t
+++ t/native_traits/trait_counter.t
@@ -9,7 +9,7 @@ use Moose ();
 use Moose::Util::TypeConstraints;
 use NoInlineAttribute;
 use Test::Fatal;
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Moose;
 
 {
@@ -169,4 +169,4 @@ for my $attr ('lazy', 'nonlazy') {
     is($obj->$attr, 1, "reset resets it to its default value");
 }
 
-done_testing;
+#done_testing;
Index: t/native_traits/trait_hash.t
===================================================================
--- t.orig/native_traits/trait_hash.t
+++ t/native_traits/trait_hash.t
@@ -9,7 +9,7 @@ use Moose ();
 use Moose::Util::TypeConstraints;
 use NoInlineAttribute;
 use Test::Fatal;
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Moose;
 
 {
@@ -292,4 +292,4 @@ sub run_tests {
     $class;
 }
 
-done_testing;
+#done_testing;
Index: t/native_traits/trait_number.t
===================================================================
--- t.orig/native_traits/trait_number.t
+++ t/native_traits/trait_number.t
@@ -9,7 +9,7 @@ use Moose ();
 use Moose::Util::TypeConstraints;
 use NoInlineAttribute;
 use Test::Fatal;
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Moose;
 
 {
@@ -160,4 +160,4 @@ sub run_tests {
     $class;
 }
 
-done_testing;
+#done_testing;
Index: t/native_traits/trait_string.t
===================================================================
--- t.orig/native_traits/trait_string.t
+++ t/native_traits/trait_string.t
@@ -8,7 +8,7 @@ use lib 't/lib';
 use Moose ();
 use Moose::Util::TypeConstraints;
 use NoInlineAttribute;
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 use Test::Moose;
 
@@ -302,4 +302,4 @@ sub run_tests {
     $class;
 }
 
-done_testing;
+#done_testing;
Index: t/roles/anonymous_roles.t
===================================================================
--- t.orig/roles/anonymous_roles.t
+++ t/roles/anonymous_roles.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 use Moose ();
 
 my $role = Moose::Meta::Role->create_anon_role(
@@ -33,4 +33,4 @@ ok($role->is_anon_role, "the role knows
 ok(Class::MOP::is_class_loaded(Moose::Meta::Role->create_anon_role->name), "creating an anonymous role satisifes is_class_loaded");
 ok(Class::MOP::class_of(Moose::Meta::Role->create_anon_role->name), "creating an anonymous role satisifes class_of");
 
-done_testing;
+#done_testing;
Index: t/roles/application_toclass.t
===================================================================
--- t.orig/roles/application_toclass.t
+++ t/roles/application_toclass.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 
 do {
     package Role::Foo;
@@ -73,4 +73,4 @@ is_deeply($excludes->get_method_exclusio
 is_deeply($aliases->get_method_exclusions,   []);
 is_deeply($overrides->get_method_exclusions, []);
 
-done_testing;
+#done_testing;
Index: t/roles/apply_role.t
===================================================================
--- t.orig/roles/apply_role.t
+++ t/roles/apply_role.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 {
@@ -212,4 +212,4 @@ foreach my $foo ( $foo, $foobar ) {
     }
 }
 
-done_testing;
+#done_testing;
Index: t/roles/build.t
===================================================================
--- t.orig/roles/build.t
+++ t/roles/build.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 
 use Test::Requires {
     'Test::Output' => '0.01', # skip all if not installed
@@ -77,4 +77,4 @@ do {
     }
 }
 
-done_testing;
+#done_testing;
Index: t/roles/compose_overloading.t
===================================================================
--- t.orig/roles/compose_overloading.t
+++ t/roles/compose_overloading.t
@@ -1,6 +1,6 @@
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 
 {
     package Foo;
@@ -27,4 +27,4 @@ TODO: {
     is("$bar", 42, 'overloading can be composed');
 }
 
-done_testing;
+#done_testing;
Index: t/roles/conflict_many_methods.t
===================================================================
--- t.orig/roles/conflict_many_methods.t
+++ t/roles/conflict_many_methods.t
@@ -2,7 +2,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 {
@@ -45,4 +45,4 @@ use Test::Fatal;
     }, qr/Due to a method name conflict in roles 'Caninish' and 'Treeve', the method 'bark' must be implemented or excluded by 'PracticalJoke'/ );
 }
 
-done_testing;
+#done_testing;
Index: t/roles/create_role.t
===================================================================
--- t.orig/roles/create_role.t
+++ t/roles/create_role.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 use Moose ();
 
 my $role = Moose::Meta::Role->create(
@@ -37,4 +37,4 @@ my $composed_role = Moose::Meta::Role->c
 
 ok($composed_role->does_role('MyItem::Role::Equipment2'), "Role composed into role");
 
-done_testing;
+#done_testing;
Index: t/roles/create_role_subclass.t
===================================================================
--- t.orig/roles/create_role_subclass.t
+++ t/roles/create_role_subclass.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 use Moose ();
 
 do {
@@ -24,4 +24,4 @@ is($role->test_serial, 1, "default value
 my $nine_role = My::Meta::Role->create_anon_role(test_serial => 9);
 is($nine_role->test_serial, 9, "parameter value for the serial attribute");
 
-done_testing;
+#done_testing;
Index: t/roles/empty_method_modifiers_meta_bug.t
===================================================================
--- t.orig/roles/empty_method_modifiers_meta_bug.t
+++ t/roles/empty_method_modifiers_meta_bug.t
@@ -2,7 +2,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 # test role and class
 package SomeRole;
@@ -27,4 +27,4 @@ for my $modifier_type (qw[ before around
     is(scalar(@mms),0,'is an empty list');
 }
 
-done_testing;
+#done_testing;
Index: t/roles/extending_role_attrs.t
===================================================================
--- t.orig/roles/extending_role_attrs.t
+++ t/roles/extending_role_attrs.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 
@@ -183,4 +183,4 @@ is_deeply($quux->quux, ["hi"], "... stil
     }, qr/has '\+attr' is not supported in roles/, "Test has '+attr' in roles explodes" );
 }
 
-done_testing;
+#done_testing;
Index: t/roles/free_anonymous_roles.t
===================================================================
--- t.orig/roles/free_anonymous_roles.t
+++ t/roles/free_anonymous_roles.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 use Moose ();
 use Scalar::Util 'weaken';
 
@@ -60,4 +60,4 @@ ok($weak, "the role metaclass still exis
 
 ok($name->can('improperly_freed'), "the symbol table still exists too");
 
-done_testing;
+#done_testing;
Index: t/roles/meta_role.t
===================================================================
--- t.orig/roles/meta_role.t
+++ t/roles/meta_role.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Moose::Meta::Role;
@@ -110,4 +110,4 @@ is_deeply(
     [ 'boo' ],
     '... got the right list of before method modifiers');
 
-done_testing;
+#done_testing;
Index: t/roles/method_aliasing_in_composition.t
===================================================================
--- t.orig/roles/method_aliasing_in_composition.t
+++ t/roles/method_aliasing_in_composition.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 
@@ -205,4 +205,4 @@ ok(My::Foo::AliasOnly->meta->has_method(
     ok( ! $baz->has_method('y1'), 'Role::Baz has no y1 method' );
 }
 
-done_testing;
+#done_testing;
Index: t/roles/method_exclusion_in_composition.t
===================================================================
--- t.orig/roles/method_exclusion_in_composition.t
+++ t/roles/method_exclusion_in_composition.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 
@@ -109,4 +109,4 @@ ok(!My::Foo::Role->meta->requires_method
 ok(!My::Foo::Role::Other->meta->has_method('foo'), "we dont have a foo method");
 ok(My::Foo::Role::Other->meta->requires_method('foo'), '... and the &foo method is required');
 
-done_testing;
+#done_testing;
Index: t/roles/method_modifiers.t
===================================================================
--- t.orig/roles/method_modifiers.t
+++ t/roles/method_modifiers.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;
 
 my $FooRole;
@@ -87,4 +87,4 @@ Quux->bar;
 is($QuuxRole, 2, "modifier called");
 }
 
-done_testing;
+#done_testing;
Index: t/roles/more_alias_and_exclude.t
===================================================================
--- t.orig/roles/more_alias_and_exclude.t
+++ t/roles/more_alias_and_exclude.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 
@@ -65,4 +65,4 @@ is($c->foo_gorch, 'Foo::gorch', '... got
 is($c->baz_foo, 'Baz::foo', '... got the right method');
 is($c->baz_bar, 'Baz::bar', '... got the right method');
 
-done_testing;
+#done_testing;
Index: t/roles/more_role_edge_cases.t
===================================================================
--- t.orig/roles/more_role_edge_cases.t
+++ t/roles/more_role_edge_cases.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 
@@ -254,4 +254,4 @@ use Test::Fatal;
     }
 }
 
-done_testing;
+#done_testing;
Index: t/roles/new_meta_role.t
===================================================================
--- t.orig/roles/new_meta_role.t
+++ t/roles/new_meta_role.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 
 do {
     package My::Meta::Role;
@@ -16,4 +16,4 @@ do {
 
 is(My::Role->meta->meta->name, 'My::Meta::Role');
 
-done_testing;
+#done_testing;
Index: t/roles/overriding.t
===================================================================
--- t.orig/roles/overriding.t
+++ t/roles/overriding.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 
@@ -226,4 +226,4 @@ ok(Role::I->meta->requires_method('foo')
 
 }
 
-done_testing;
+#done_testing;
Index: t/roles/reinitialize_anon_role.t
===================================================================
--- t.orig/roles/reinitialize_anon_role.t
+++ t/roles/reinitialize_anon_role.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 
 {
     package Role::Metarole;
@@ -28,4 +28,4 @@ my ($role2);
 is_deeply([sort $role2->get_method_list], ['foo', 'meta'],
           "still has the right methods");
 
-done_testing;
+#done_testing;
Index: t/roles/role.t
===================================================================
--- t.orig/roles/role.t
+++ t/roles/role.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 =pod
@@ -153,4 +153,4 @@ is_deeply(
     [ 'bling', 'fling' ],
     '... got the right list of override method modifiers');
 
-done_testing;
+#done_testing;
Index: t/roles/role_attr_application.t
===================================================================
--- t.orig/roles/role_attr_application.t
+++ t/roles/role_attr_application.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Moose;
 use Moose::Util qw( does_role );
 
@@ -289,4 +289,4 @@ ok(!Moose::Util::does_role(Baz->meta->ge
 
 
 
-done_testing;
+#done_testing;
Index: t/roles/role_attribute_conflict.t
===================================================================
--- t.orig/roles/role_attribute_conflict.t
+++ t/roles/role_attribute_conflict.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 {
@@ -25,4 +25,4 @@ use Test::Fatal;
     ::like( ::exception { with 'My::Role1' }, qr/attribute conflict.+My::Role2.+foo/, 'attribute conflict when composing one role into another' );
 }
 
-done_testing;
+#done_testing;
Index: t/roles/role_attrs.t
===================================================================
--- t.orig/roles/role_attrs.t
+++ t/roles/role_attrs.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 use Moose ();
 use Moose::Meta::Role;
@@ -50,4 +50,4 @@ is(
     'associated_role for foo attr is still Foo role'
 );
 
-done_testing;
+#done_testing;
Index: t/roles/role_compose_requires.t
===================================================================
--- t.orig/roles/role_compose_requires.t
+++ t/roles/role_compose_requires.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 {
@@ -129,4 +129,4 @@ is( exception {
 
 isnt( exception { package My::Test14; use Moose; with 'My::Role1'; with 'My::Role5'; }, undef, 'class consumes role1; consumes role5(provides method)' );
 
-done_testing;
+#done_testing;
Index: t/roles/role_composite.t
===================================================================
--- t.orig/roles/role_composite.t
+++ t/roles/role_composite.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Moose::Meta::Role::Application::RoleSummation;
@@ -79,4 +79,4 @@ use Moose::Meta::Role::Composite;
     }
 }
 
-done_testing;
+#done_testing;
Index: t/roles/role_composite_exclusion.t
===================================================================
--- t.orig/roles/role_composite_exclusion.t
+++ t/roles/role_composite_exclusion.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Moose::Meta::Role::Application::RoleSummation;
@@ -106,4 +106,4 @@ isnt( exception {
     );
 }, undef, '... this fails as expected' );
 
-done_testing;
+#done_testing;
Index: t/roles/role_composition_attributes.t
===================================================================
--- t.orig/roles/role_composition_attributes.t
+++ t/roles/role_composition_attributes.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Moose::Meta::Role::Application::RoleSummation;
@@ -92,4 +92,4 @@ isnt( exception {
     );
 }, undef, '... this fails as expected' );
 
-done_testing;
+#done_testing;
Index: t/roles/role_composition_errors.t
===================================================================
--- t.orig/roles/role_composition_errors.t
+++ t/roles/role_composition_errors.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 
@@ -140,4 +140,4 @@ is_deeply(
     ::like( ::exception { with('Quux::Role') }, qr/'Quux::Role' requires the methods 'meth3' and 'meth4' to be implemented by 'Quux::Class4'/, 'exception mentions all the require methods that are accessors at once, as well as missing methods, but not the one that exists' );
 }
 
-done_testing;
+#done_testing;
Index: t/roles/role_composition_method_mods.t
===================================================================
--- t.orig/roles/role_composition_method_mods.t
+++ t/roles/role_composition_method_mods.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Moose::Meta::Role::Application::RoleSummation;
@@ -85,4 +85,4 @@ use Moose::Meta::Role::Composite;
     );
 }
 
-done_testing;
+#done_testing;
Index: t/roles/role_composition_methods.t
===================================================================
--- t.orig/roles/role_composition_methods.t
+++ t/roles/role_composition_methods.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Moose::Meta::Role::Application::RoleSummation;
@@ -149,4 +149,4 @@ use Moose::Meta::Role::Composite;
     );
 }
 
-done_testing;
+#done_testing;
Index: t/roles/role_composition_override.t
===================================================================
--- t.orig/roles/role_composition_override.t
+++ t/roles/role_composition_override.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Moose::Meta::Role::Application::RoleSummation;
@@ -111,4 +111,4 @@ isnt( exception {
     );
 }, undef, '... this fails as expected' );
 
-done_testing;
+#done_testing;
Index: t/roles/role_composition_req_methods.t
===================================================================
--- t.orig/roles/role_composition_req_methods.t
+++ t/roles/role_composition_req_methods.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Moose::Meta::Role::Application::RoleSummation;
@@ -122,4 +122,4 @@ use Moose::Meta::Role::Composite;
     );
 }
 
-done_testing;
+#done_testing;
Index: t/roles/role_conflict_detection.t
===================================================================
--- t.orig/roles/role_conflict_detection.t
+++ t/roles/role_conflict_detection.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 =pod
@@ -570,4 +570,4 @@ is($test26->ghost, 'My::Test26::ghost',
 
 =cut
 
-done_testing;
+#done_testing;
Index: t/roles/role_conflict_edge_cases.t
===================================================================
--- t.orig/roles/role_conflict_edge_cases.t
+++ t/roles/role_conflict_edge_cases.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 =pod
@@ -187,4 +187,4 @@ ok(My::Test::Class4->meta->has_attribute
 
 is(My::Test::Class4->new->foo, 'Role::Base::foo', '... got the right value from method');
 
-done_testing;
+#done_testing;
Index: t/roles/role_consumers.t
===================================================================
--- t.orig/roles/role_consumers.t
+++ t/roles/role_consumers.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 {
     package Foo::Role;
@@ -51,4 +51,4 @@ is_deeply([sort Bar::Role->meta->consume
 is_deeply([sort Foo::Role::User->meta->consumers],
           ['Foo::User']);
 
-done_testing;
+#done_testing;
Index: t/roles/role_exclusion.t
===================================================================
--- t.orig/roles/role_exclusion.t
+++ t/roles/role_exclusion.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 =pod
@@ -118,4 +118,4 @@ ok(My::Test4->meta->does_role('Molecule:
 ok(My::Test4->meta->excludes_role('Molecule::Inorganic'), '... My::Test4 meta excludes Molecule::Organic');
 ok(!My::Test4->does('Molecule::Inorganic'), '... My::Test4 does Molecule::Inorganic');
 
-done_testing;
+#done_testing;
Index: t/roles/role_exclusion_and_alias_bug.t
===================================================================
--- t.orig/roles/role_exclusion_and_alias_bug.t
+++ t/roles/role_exclusion_and_alias_bug.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Moose;
 
 {
@@ -66,4 +66,4 @@ use Test::Moose;
     is($x->gorch, 'BAR', '... got the right value');
 }
 
-done_testing;
+#done_testing;
Index: t/roles/role_for_combination.t
===================================================================
--- t.orig/roles/role_for_combination.t
+++ t/roles/role_for_combination.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 
 my $OPTS;
 do {
@@ -43,4 +43,4 @@ is(My::Class->foo, 'My::Singleton::Role'
 is(My::Class->bar, 'My::Usual::Role', 'collateral role');
 is_deeply($OPTS, { number => 1 });
 
-done_testing;
+#done_testing;
Index: t/roles/roles_and_method_cloning.t
===================================================================
--- t.orig/roles/roles_and_method_cloning.t
+++ t/roles/roles_and_method_cloning.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 
 {
@@ -76,4 +76,4 @@ isnt( ClassA->foo, "ClassB::foo", "Class
 is( ClassB->foo, 'Role::Foo::foo', 'ClassB::foo knows its name' );
 is( ClassA->foo, 'Role::Foo::foo', 'ClassA::foo knows its name' );
 
-done_testing;
+#done_testing;
Index: t/roles/roles_and_req_method_edge_cases.t
===================================================================
--- t.orig/roles/roles_and_req_method_edge_cases.t
+++ t/roles/roles_and_req_method_edge_cases.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 =pod
@@ -276,4 +276,4 @@ method modifier.
     }, undef, 'required method exists in superclass as non-modifier, so we live' );
 }
 
-done_testing;
+#done_testing;
Index: t/roles/roles_applied_in_create.t
===================================================================
--- t.orig/roles/roles_applied_in_create.t
+++ t/roles/roles_applied_in_create.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 use Moose::Meta::Class;
 use Moose::Util;
@@ -22,4 +22,4 @@ is( exception {
     );
 }, undef, 'Create a new class with several roles' );
 
-done_testing;
+#done_testing;
Index: t/roles/run_time_role_composition.t
===================================================================
--- t.orig/roles/run_time_role_composition.t
+++ t/roles/run_time_role_composition.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 use Scalar::Util qw(blessed);
 
@@ -110,4 +110,4 @@ isa_ok($obj2, 'My::Class');
     is(blessed($obj), blessed($obj2), '... they now share the same anon-class/role thing');
 }
 
-done_testing;
+#done_testing;
Index: t/roles/runtime_roles_and_attrs.t
===================================================================
--- t.orig/roles/runtime_roles_and_attrs.t
+++ t/roles/runtime_roles_and_attrs.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 use Scalar::Util 'blessed';
 
@@ -54,4 +54,4 @@ is( exception {
 
 is($obj->fur, "dirty", "role attr initialized");
 
-done_testing;
+#done_testing;
Index: t/roles/runtime_roles_and_nonmoose.t
===================================================================
--- t.orig/roles/runtime_roles_and_nonmoose.t
+++ t/roles/runtime_roles_and_nonmoose.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 use Scalar::Util 'blessed';
 
@@ -53,4 +53,4 @@ is( exception {
     $foo->dog($bar)
 }, undef, '... and setting the accessor is okay' );
 
-done_testing;
+#done_testing;
Index: t/roles/runtime_roles_w_params.t
===================================================================
--- t.orig/roles/runtime_roles_w_params.t
+++ t/roles/runtime_roles_w_params.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 
@@ -69,4 +69,4 @@ use Test::Fatal;
     is($foo->baz, 'FOO-BAZ', '... got the expect value');
 }
 
-done_testing;
+#done_testing;
Index: t/test_moose/test_moose.t
===================================================================
--- t.orig/test_moose/test_moose.t
+++ t/test_moose/test_moose.t
@@ -3,10 +3,10 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 BEGIN {
     use_ok('Test::Moose');
 }
 
-done_testing;
+#done_testing;
Index: t/test_moose/test_moose_does_ok.t
===================================================================
--- t.orig/test_moose/test_moose_does_ok.t
+++ t/test_moose/test_moose_does_ok.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use Test::Builder::Tester;
-use Test::More;
+use Test::More qw(no_plan);
 
 BEGIN {
   use_ok('Test::Moose');
@@ -59,4 +59,4 @@ does_ok ($baz,'Foo','does_ok object fail
 
 test_test ('does_ok');
 
-done_testing;
+#done_testing;
Index: t/test_moose/test_moose_has_attribute_ok.t
===================================================================
--- t.orig/test_moose/test_moose_has_attribute_ok.t
+++ t/test_moose/test_moose_has_attribute_ok.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use Test::Builder::Tester;
-use Test::More;
+use Test::More qw(no_plan);
 
 BEGIN {
   use_ok('Test::Moose');
@@ -46,4 +46,4 @@ has_attribute_ok('Bar', 'bar', '... has_
 
 test_test ('has_attribute_ok');
 
-done_testing;
+#done_testing;
Index: t/test_moose/test_moose_meta_ok.t
===================================================================
--- t.orig/test_moose/test_moose_meta_ok.t
+++ t/test_moose/test_moose_meta_ok.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use Test::Builder::Tester;
-use Test::More;
+use Test::More qw(no_plan);
 
 BEGIN {
   use_ok('Test::Moose');
@@ -30,4 +30,4 @@ meta_ok('Bar', '... meta_ok(Bar) fails')
 
 test_test ('meta_ok');
 
-done_testing;
+#done_testing;
Index: t/test_moose/with_immutable.t
===================================================================
--- t.orig/test_moose/with_immutable.t
+++ t/test_moose/with_immutable.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use Test::Builder::Tester;
-use Test::More;
+use Test::More qw(no_plan);
 
 BEGIN {
   use_ok('Test::Moose');
@@ -37,4 +37,4 @@ $ret = with_immutable {
 test_test('with_immutable success');
 ok($ret, "all tests succeeded");
 
-done_testing;
+#done_testing;
Index: t/todo_tests/exception_reflects_failed_constraint.t
===================================================================
--- t.orig/todo_tests/exception_reflects_failed_constraint.t
+++ t/todo_tests/exception_reflects_failed_constraint.t
@@ -7,7 +7,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 BEGIN {
@@ -32,4 +32,4 @@ is( exception {
     };
 }
 
-done_testing;
+#done_testing;
Index: t/todo_tests/immutable_n_around.t
===================================================================
--- t.orig/todo_tests/immutable_n_around.t
+++ t/todo_tests/immutable_n_around.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 # if make_immutable is removed from the following code the tests pass
 
@@ -53,4 +53,4 @@ tests: {
     }
 }
 
-done_testing;
+#done_testing;
Index: t/todo_tests/moose_and_threads.t
===================================================================
--- t.orig/todo_tests/moose_and_threads.t
+++ t/todo_tests/moose_and_threads.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 
 =pod
@@ -37,4 +37,4 @@ $thr->join();
     fail('Moose type constraints and threads dont get along');
 }
 
-done_testing;
+#done_testing;
Index: t/todo_tests/replacing_super_methods.t
===================================================================
--- t.orig/todo_tests/replacing_super_methods.t
+++ t/todo_tests/replacing_super_methods.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 
 my ($super_called, $sub_called, $new_super_called) = (0, 0, 0);
 {
@@ -40,4 +40,4 @@ is($new_super_called, 1, "new super call
 }
 is($sub_called, 1, "sub called");
 
-done_testing;
+#done_testing;
Index: t/todo_tests/required_role_accessors.t
===================================================================
--- t.orig/todo_tests/required_role_accessors.t
+++ t/todo_tests/required_role_accessors.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;
 
 {
@@ -55,4 +55,4 @@ use Test::Fatal;
     }
 }
 
-done_testing;
+#done_testing;
Index: t/todo_tests/role_insertion_order.t
===================================================================
--- t.orig/todo_tests/role_insertion_order.t
+++ t/todo_tests/role_insertion_order.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 
 {
     package Foo::Role;
@@ -39,4 +39,4 @@ my %class_insertion_order = (
 is_deeply({ map { $_->name => $_->insertion_order } Foo->meta->get_all_attributes }, \%class_insertion_order, "right insertion order within the class");
 }
 
-done_testing;
+#done_testing;
Index: t/todo_tests/various_role_features.t
===================================================================
--- t.orig/todo_tests/various_role_features.t
+++ t/todo_tests/various_role_features.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 sub req_or_has ($$) {
@@ -233,7 +233,7 @@ isa_ok( $robot->get_attribute("twist"),
     isa_ok( $robot->get_method("twist"), "Moose::Meta::Method::Accessor" );
 }
 
-done_testing;
+#done_testing;
 
 __END__
 
Index: t/type_constraints/advanced_type_creation.t
===================================================================
--- t.orig/type_constraints/advanced_type_creation.t
+++ t/type_constraints/advanced_type_creation.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 BEGIN {
     use_ok('Moose::Util::TypeConstraints');
@@ -96,4 +96,4 @@ ok(!$array_of_array_of_array_of_ints->ch
     [[[ 1, 2, 3 ]], [[ qw/foo bar/ ]]]
 ), '... [[[ 1, 2, 3 ]], [[ qw/foo bar/ ]]] failed successfully');
 
-done_testing;
+#done_testing;
Index: t/type_constraints/class_subtypes.t
===================================================================
--- t.orig/type_constraints/class_subtypes.t
+++ t/type_constraints/class_subtypes.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Moose::Util::TypeConstraints;
@@ -140,4 +140,4 @@ is( exception {
     Quux::Ier->new(age => (bless {}, 'Negative'))
 }, undef );
 
-done_testing;
+#done_testing;
Index: t/type_constraints/class_type_constraint.t
===================================================================
--- t.orig/type_constraints/class_type_constraint.t
+++ t/type_constraints/class_type_constraint.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 BEGIN {
@@ -60,4 +60,4 @@ ok( $type->equals(Moose::Meta::TypeConst
 ok( !$type->equals(Moose::Meta::TypeConstraint::Class->new( name => "__ANON__", class => "Bar" )), "doesn't equal other anon constraint" );
 ok( $type->is_subtype_of(Moose::Meta::TypeConstraint::Class->new( name => "__ANON__", class => "Bar" )), "subtype of other anon constraint" );
 
-done_testing;
+#done_testing;
Index: t/type_constraints/coerced_parameterized_types.t
===================================================================
--- t.orig/type_constraints/coerced_parameterized_types.t
+++ t/type_constraints/coerced_parameterized_types.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 BEGIN {
@@ -56,4 +56,4 @@ ok($evenlist->check(MyList->new(10, 20,
 ok(!$evenlist->check(MyList->new(10, "two")), '... validated it correctly (fail)');
 ok(!$evenlist->check([10, 20]), '... validated it correctly (fail)');
 
-done_testing;
+#done_testing;
Index: t/type_constraints/container_type_coercion.t
===================================================================
--- t.orig/type_constraints/container_type_coercion.t
+++ t/type_constraints/container_type_coercion.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 BEGIN {
     use_ok('Moose::Util::TypeConstraints');
@@ -64,4 +64,4 @@ isa_ok($foo, 'Foo');
 
 is_deeply([ sort @{$foo->bar} ], [ 1, 2, 3 ], '... our coercion worked!');
 
-done_testing;
+#done_testing;
Index: t/type_constraints/container_type_constraint.t
===================================================================
--- t.orig/type_constraints/container_type_constraint.t
+++ t/type_constraints/container_type_constraint.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 BEGIN {
     use_ok('Moose::Util::TypeConstraints');
@@ -71,4 +71,4 @@ ok(!$array_of_array_of_ints->check(
     isa_ok( $param_type, 'Moose::Meta::TypeConstraint::Class' );
 }
 
-done_testing;
+#done_testing;
Index: t/type_constraints/custom_parameterized_types.t
===================================================================
--- t.orig/type_constraints/custom_parameterized_types.t
+++ t/type_constraints/custom_parameterized_types.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 BEGIN {
@@ -84,4 +84,4 @@ isnt( exception {
     );
 }, undef, 'non-containers cannot be parameterized' );
 
-done_testing;
+#done_testing;
Index: t/type_constraints/custom_type_errors.t
===================================================================
--- t.orig/type_constraints/custom_type_errors.t
+++ t/type_constraints/custom_type_errors.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 {
@@ -44,4 +44,4 @@ is( $@, '', '... no errors thrown, value
 
 like( exception { $gimp->leg_count }, qr/This number \(0\) is not less than ten!/, 'gave custom supertype error message on lazy set to 0' );
 
-done_testing;
+#done_testing;
Index: t/type_constraints/define_type_twice_throws.t
===================================================================
--- t.orig/type_constraints/define_type_twice_throws.t
+++ t/type_constraints/define_type_twice_throws.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 BEGIN {
@@ -24,4 +24,4 @@ like( exception {
     subtype 'MySubType' => as 'Int' => where { 1 };
 }, qr/cannot be created again/, 'Trying to create same type twice throws' );
 
-done_testing;
+#done_testing;
Index: t/type_constraints/duck_type_handles.t
===================================================================
--- t.orig/type_constraints/duck_type_handles.t
+++ t/type_constraints/duck_type_handles.t
@@ -2,7 +2,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 my @phonograph;
 {
@@ -43,4 +43,4 @@ is_deeply([splice @phonograph], ['quack'
 $t->walk;
 is_deeply([splice @phonograph], ['footsteps']);
 
-done_testing;
+#done_testing;
Index: t/type_constraints/duck_types.t
===================================================================
--- t.orig/type_constraints/duck_types.t
+++ t/type_constraints/duck_types.t
@@ -2,7 +2,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 {
@@ -76,4 +76,4 @@ is( exception { DucktypeTest->new( duck
 # try with the other constraint form
 is( exception { DucktypeTest->new( other_swan => Swan->new ) }, undef, 'but a Swan can honk' );
 
-done_testing;
+#done_testing;
Index: t/type_constraints/enum.t
===================================================================
--- t.orig/type_constraints/enum.t
+++ t/type_constraints/enum.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Scalar::Util ();
@@ -84,4 +84,4 @@ like( exception {
 }, qr/enum called with an array reference and additional arguments\. Did you mean to parenthesize the enum call's parameters\?/ );
 
 
-done_testing;
+#done_testing;
Index: t/type_constraints/match_type_operator.t
===================================================================
--- t.orig/type_constraints/match_type_operator.t
+++ t/type_constraints/match_type_operator.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Moose::Util::TypeConstraints;
@@ -226,4 +226,4 @@ like( exception {
     not_enough_matches( [] )
 }, qr/No cases matched for /, '... not enough matches' );
 
-done_testing;
+#done_testing;
Index: t/type_constraints/maybe_type_constraint.t
===================================================================
--- t.orig/type_constraints/maybe_type_constraint.t
+++ t/type_constraints/maybe_type_constraint.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Moose::Util::TypeConstraints;
@@ -128,4 +128,4 @@ ok !$Maybe_Int->check("a")
 
 like( exception { $obj->Maybe_Int("a") }, qr/Attribute \(Maybe_Int\) does not pass the type constraint/, 'failed assigned ("a")' );
 
-done_testing;
+#done_testing;
Index: t/type_constraints/misc_type_tests.t
===================================================================
--- t.orig/type_constraints/misc_type_tests.t
+++ t/type_constraints/misc_type_tests.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 use Scalar::Util qw(refaddr);
 
@@ -86,4 +86,4 @@ ok $subtype2 => 'made a subtype of our s
 
 ok $subtype1, "type constraint boolean overload works";
 
-done_testing;
+#done_testing;
Index: t/type_constraints/normalize_type_name.t
===================================================================
--- t.orig/type_constraints/normalize_type_name.t
+++ t/type_constraints/normalize_type_name.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 BEGIN {
     use_ok('Moose::Util::TypeConstraints');
@@ -149,4 +149,4 @@ is $union1->name, $union3->name, 'names
 
 is $union2->name, $union3->name, 'names match';
 
-done_testing;
+#done_testing;
Index: t/type_constraints/parameterize_from.t
===================================================================
--- t.orig/type_constraints/parameterize_from.t
+++ t/type_constraints/parameterize_from.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 BEGIN {
@@ -75,4 +75,4 @@ like( exception {
     $params->from_parameterizable( { a => 'Hello', b => 'World' } );
     }, qr/Attribute \(from_parameterizable\) does not pass the type constraint/, 'from_parameterizable throws expected error' );
 
-done_testing;
+#done_testing;
Index: t/type_constraints/role_type_constraint.t
===================================================================
--- t.orig/type_constraints/role_type_constraint.t
+++ t/type_constraints/role_type_constraint.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 BEGIN {
@@ -63,4 +63,4 @@ ok( $type->equals(Moose::Meta::TypeConst
 ok( !$type->equals(Moose::Meta::TypeConstraint::Role->new( name => "__ANON__", role => "Bar" )), "doesn't equal other anon constraint" );
 ok( $type->is_subtype_of(Moose::Meta::TypeConstraint::Role->new( name => "__ANON__", role => "Bar" )), "subtype of other anon constraint" );
 
-done_testing;
+#done_testing;
Index: t/type_constraints/subtype_auto_vivify_parent.t
===================================================================
--- t.orig/type_constraints/subtype_auto_vivify_parent.t
+++ t/type_constraints/subtype_auto_vivify_parent.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 use Moose::Util::TypeConstraints;
 
@@ -30,4 +30,4 @@ is( $type->parent->name, 'Foo', 'parent
 isa_ok( $type->parent, 'Moose::Meta::TypeConstraint::Class',
         'parent type constraint is a class type' );
 
-done_testing;
+#done_testing;
Index: t/type_constraints/subtyping_parameterized_types.t
===================================================================
--- t.orig/type_constraints/subtyping_parameterized_types.t
+++ t/type_constraints/subtyping_parameterized_types.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 BEGIN {
@@ -128,4 +128,4 @@ is( exception {
     ok !$RefToInt->check(\"foo"), '\"foo" is not';
 }
 
-done_testing;
+#done_testing;
Index: t/type_constraints/subtyping_union_types.t
===================================================================
--- t.orig/type_constraints/subtyping_union_types.t
+++ t/type_constraints/subtyping_union_types.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 BEGIN {
@@ -66,4 +66,4 @@ is( exception {
     ok(!$t->check(1), '... validated it correctly');
 }
 
-done_testing;
+#done_testing;
Index: t/type_constraints/throw_error.t
===================================================================
--- t.orig/type_constraints/throw_error.t
+++ t/type_constraints/throw_error.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 use Moose::Util::TypeConstraints;
 
@@ -11,4 +11,4 @@ eval { Moose::Util::TypeConstraints::cre
 like( $@, qr/\QYou must pass in at least 2 type names to make a union/,
       'can throw a proper error without Moose being loaded by the caller' );
 
-done_testing;
+#done_testing;
Index: t/type_constraints/type_coersion_on_lazy_attributes.t
===================================================================
--- t.orig/type_constraints/type_coersion_on_lazy_attributes.t
+++ t/type_constraints/type_coersion_on_lazy_attributes.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 {
     package SomeClass;
@@ -31,4 +31,4 @@ my $attr = SomeClass->meta->get_attribut
 is($attr->get_value(SomeClass->new()), 'Six');
 is(SomeClass->new()->foo, 'Six');
 
-done_testing;
+#done_testing;
Index: t/type_constraints/type_names.t
===================================================================
--- t.orig/type_constraints/type_names.t
+++ t/type_constraints/type_names.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Moose::Meta::TypeConstraint;
@@ -43,4 +43,4 @@ is( Moose::Util::TypeConstraints::find_o
     'ArrayRef[Va.lid]',
     'find_or_parse_type_constraint returns name for valid name' );
 
-done_testing;
+#done_testing;
Index: t/type_constraints/type_notation_parser.t
===================================================================
--- t.orig/type_constraints/type_notation_parser.t
+++ t/type_constraints/type_notation_parser.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 BEGIN {
     use_ok("Moose::Util::TypeConstraints");
@@ -104,4 +104,4 @@ ok(!Moose::Util::TypeConstraints::_detec
     ) for keys %split_tests;
 }
 
-done_testing;
+#done_testing;
Index: t/type_constraints/types_and_undef.t
===================================================================
--- t.orig/type_constraints/types_and_undef.t
+++ t/type_constraints/types_and_undef.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 
@@ -107,4 +107,4 @@ isnt( exception { $foo->v_lazy_Number()
 isnt( exception { $foo->v_lazy_Str() }, undef, '... undef is NOT a Foo->Str' );
 isnt( exception { $foo->v_lazy_String() }, undef, '... undef is NOT a Foo->String' );
 
-done_testing;
+#done_testing;
Index: t/type_constraints/union_types.t
===================================================================
--- t.orig/type_constraints/union_types.t
+++ t/type_constraints/union_types.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 BEGIN {
     use_ok('Moose::Util::TypeConstraints');
@@ -81,4 +81,4 @@ is($HashOrArray->validate(50),
 'Validation failed for \'ArrayRef\' with value 50 and Validation failed for \'HashRef\' with value 50 in (ArrayRef|HashRef)',
 '... (ArrayRef | HashRef) cannot accept Numbers');
 
-done_testing;
+#done_testing;
Index: t/type_constraints/union_types_and_coercions.t
===================================================================
--- t.orig/type_constraints/union_types_and_coercions.t
+++ t/type_constraints/union_types_and_coercions.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Test::Requires {
@@ -184,4 +184,4 @@ use Test::Requires {
     like( exception { Foo->new( carray => {} ) }, qr/\QValidation failed for 'Coerced|Coerced' with value \E(?!undef)/, 'Cannot pass a hash ref for carray attribute, and hash ref is not coerced to an undef' );
 }
 
-done_testing;
+#done_testing;
Index: t/type_constraints/util_find_type_constraint.t
===================================================================
--- t.orig/type_constraints/util_find_type_constraint.t
+++ t/type_constraints/util_find_type_constraint.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 BEGIN {
     use_ok('Moose::Util::TypeConstraints');
@@ -36,4 +36,4 @@ foreach my $type_name (qw(
 # TODO:
 # add tests for is_subtype_of which confirm the hierarchy
 
-done_testing;
+#done_testing;
Index: t/type_constraints/util_more_type_coercion.t
===================================================================
--- t.orig/type_constraints/util_more_type_coercion.t
+++ t/type_constraints/util_more_type_coercion.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 
@@ -129,4 +129,4 @@ isnt( exception {
     like( exception { $tc->assert_coerce('total garbage') }, qr/Validation failed for .HTTPHeader./, "assert_coerce throws if result is not acceptable" );
 }
 
-done_testing;
+#done_testing;
Index: t/type_constraints/util_std_type_constraints.t
===================================================================
--- t.orig/type_constraints/util_std_type_constraints.t
+++ t/type_constraints/util_std_type_constraints.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 use Scalar::Util ();
 
@@ -377,4 +377,4 @@ ok(defined RoleName('Quux::Wibble::Role'
 
 close($fh) || die "Could not close the filehandle $0 for test";
 
-done_testing;
+#done_testing;
Index: t/type_constraints/util_type_coercion.t
===================================================================
--- t.orig/type_constraints/util_type_coercion.t
+++ t/type_constraints/util_type_coercion.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 BEGIN {
@@ -101,4 +101,4 @@ my $tc = find_type_constraint('StrWithTr
 is($tc->coerce("foo"), "fooX", "coerce when needed");
 is($tc->coerce("fooX"), "fooX", "do not coerce when unneeded");
 
-done_testing;
+#done_testing;
Index: t/type_constraints/util_type_constraints.t
===================================================================
--- t.orig/type_constraints/util_type_constraints.t
+++ t/type_constraints/util_type_constraints.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Scalar::Util ();
@@ -228,4 +228,4 @@ like( exception {$r->add_type_constraint
     ok( ! $subtype->check('Foo'), '... this is not a Natural');
 }
 
-done_testing;
+#done_testing;
Index: t/type_constraints/util_type_constraints_export.t
===================================================================
--- t.orig/type_constraints/util_type_constraints_export.t
+++ t/type_constraints/util_type_constraints_export.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 {
     package Foo;
@@ -26,4 +26,4 @@ use Test::More;
     ::ok( MyArrayRef( [] ), '... ArrayRef worked correctly' );
 }
 
-done_testing;
+#done_testing;
Index: t/type_constraints/util_type_reloading.t
===================================================================
--- t.orig/type_constraints/util_type_reloading.t
+++ t/type_constraints/util_type_reloading.t
@@ -5,7 +5,7 @@ use warnings;
 
 use lib 't/lib', 'lib';
 
-use Test::More;
+use Test::More qw(no_plan);
 
 
 $SIG{__WARN__} = sub { 0 };
@@ -26,4 +26,4 @@ delete $INC{'Bar.pm'};
 eval { require Bar; };
 ok(!$@, '... re-loaded Bar successfully') || diag $@;
 
-done_testing;
+#done_testing;