Update Test-Simple to CPAN version 1.302073

95 files changed, 291 insertions, 145 deletions

diff --git a/cpan/Test-Simple/lib/Test/Builder.pm b/cpan/Test-Simple/lib/Test/Builder.pm
index c21fbff36b..052e2793b9 100644
--- a/cpan/Test-Simple/lib/Test/Builder.pm
+++ b/cpan/Test-Simple/lib/Test/Builder.pm
@@ -4,7 +4,7 @@ use 5.006;
 use strict;
 use warnings;
 
-our $VERSION = '1.302071';
+our $VERSION = '1.302073';
 
 BEGIN {
     if( $] < 5.008 ) {
diff --git a/cpan/Test-Simple/lib/Test/Builder/Formatter.pm b/cpan/Test-Simple/lib/Test/Builder/Formatter.pm
index 3586c9f662..96571c6005 100644
--- a/cpan/Test-Simple/lib/Test/Builder/Formatter.pm
+++ b/cpan/Test-Simple/lib/Test/Builder/Formatter.pm
@@ -2,7 +2,7 @@ package Test::Builder::Formatter;
 use strict;
 use warnings;
 
-our $VERSION = '1.302071';
+our $VERSION = '1.302073';
 
 BEGIN { require Test2::Formatter::TAP; our @ISA = qw(Test2::Formatter::TAP) }
 
diff --git a/cpan/Test-Simple/lib/Test/Builder/Module.pm b/cpan/Test-Simple/lib/Test/Builder/Module.pm
index 7755da5a25..6fbba79fc0 100644
--- a/cpan/Test-Simple/lib/Test/Builder/Module.pm
+++ b/cpan/Test-Simple/lib/Test/Builder/Module.pm
@@ -7,7 +7,7 @@ use Test::Builder;
 require Exporter;
 our @ISA = qw(Exporter);
 
-our $VERSION = '1.302071';
+our $VERSION = '1.302073';
 
 
 =head1 NAME
diff --git a/cpan/Test-Simple/lib/Test/Builder/Tester.pm b/cpan/Test-Simple/lib/Test/Builder/Tester.pm
index 46f5aecb93..647ea2d371 100644
--- a/cpan/Test-Simple/lib/Test/Builder/Tester.pm
+++ b/cpan/Test-Simple/lib/Test/Builder/Tester.pm
@@ -1,7 +1,7 @@
 package Test::Builder::Tester;
 
 use strict;
-our $VERSION = '1.302071';
+our $VERSION = '1.302073';
 
 use Test::Builder;
 use Symbol;
diff --git a/cpan/Test-Simple/lib/Test/Builder/Tester/Color.pm b/cpan/Test-Simple/lib/Test/Builder/Tester/Color.pm
index d0cff138ef..939e7f1cd3 100644
--- a/cpan/Test-Simple/lib/Test/Builder/Tester/Color.pm
+++ b/cpan/Test-Simple/lib/Test/Builder/Tester/Color.pm
@@ -1,7 +1,7 @@
 package Test::Builder::Tester::Color;
 
 use strict;
-our $VERSION = '1.302071';
+our $VERSION = '1.302073';
 
 require Test::Builder::Tester;
 
diff --git a/cpan/Test-Simple/lib/Test/Builder/TodoDiag.pm b/cpan/Test-Simple/lib/Test/Builder/TodoDiag.pm
index 31f2b4b0de..74ae0787b6 100644
--- a/cpan/Test-Simple/lib/Test/Builder/TodoDiag.pm
+++ b/cpan/Test-Simple/lib/Test/Builder/TodoDiag.pm
@@ -2,7 +2,7 @@ package Test::Builder::TodoDiag;
 use strict;
 use warnings;
 
-our $VERSION = '1.302071';
+our $VERSION = '1.302073';
 
 BEGIN { require Test2::Event::Diag; our @ISA = qw(Test2::Event::Diag) }
 
diff --git a/cpan/Test-Simple/lib/Test/More.pm b/cpan/Test-Simple/lib/Test/More.pm
index 9fe4d5c730..2863c1bba5 100644
--- a/cpan/Test-Simple/lib/Test/More.pm
+++ b/cpan/Test-Simple/lib/Test/More.pm
@@ -17,7 +17,7 @@ sub _carp {
     return warn @_, " at $file line $line\n";
 }
 
-our $VERSION = '1.302071';
+our $VERSION = '1.302073';
 
 use Test::Builder::Module;
 our @ISA    = qw(Test::Builder::Module);
diff --git a/cpan/Test-Simple/lib/Test/Simple.pm b/cpan/Test-Simple/lib/Test/Simple.pm
index 15b7ab1326..f148fe62c9 100644
--- a/cpan/Test-Simple/lib/Test/Simple.pm
+++ b/cpan/Test-Simple/lib/Test/Simple.pm
@@ -4,7 +4,7 @@ use 5.006;
 
 use strict;
 
-our $VERSION = '1.302071';
+our $VERSION = '1.302073';
 
 use Test::Builder::Module;
 our @ISA    = qw(Test::Builder::Module);
diff --git a/cpan/Test-Simple/lib/Test/Tester.pm b/cpan/Test-Simple/lib/Test/Tester.pm
index de66efeba3..a324a1bf47 100644
--- a/cpan/Test-Simple/lib/Test/Tester.pm
+++ b/cpan/Test-Simple/lib/Test/Tester.pm
@@ -18,7 +18,7 @@ require Exporter;
 
 use vars qw( @ISA @EXPORT );
 
-our $VERSION = '1.302071';
+our $VERSION = '1.302073';
 
 @EXPORT = qw( run_tests check_tests check_test cmp_results show_space );
 @ISA = qw( Exporter );
diff --git a/cpan/Test-Simple/lib/Test/Tester/Capture.pm b/cpan/Test-Simple/lib/Test/Tester/Capture.pm
index 01fef34478..d8eb170b6c 100644
--- a/cpan/Test-Simple/lib/Test/Tester/Capture.pm
+++ b/cpan/Test-Simple/lib/Test/Tester/Capture.pm
@@ -2,7 +2,7 @@ use strict;
 
 package Test::Tester::Capture;
 
-our $VERSION = '1.302071';
+our $VERSION = '1.302073';
 
 
 use Test::Builder;
diff --git a/cpan/Test-Simple/lib/Test/Tester/CaptureRunner.pm b/cpan/Test-Simple/lib/Test/Tester/CaptureRunner.pm
index 1e06d7a62b..bed18e8c48 100644
--- a/cpan/Test-Simple/lib/Test/Tester/CaptureRunner.pm
+++ b/cpan/Test-Simple/lib/Test/Tester/CaptureRunner.pm
@@ -3,7 +3,7 @@ use strict;
 
 package Test::Tester::CaptureRunner;
 
-our $VERSION = '1.302071';
+our $VERSION = '1.302073';
 
 
 use Test::Tester::Capture;
diff --git a/cpan/Test-Simple/lib/Test/Tester/Delegate.pm b/cpan/Test-Simple/lib/Test/Tester/Delegate.pm
index 8724e189f0..ed627db442 100644
--- a/cpan/Test-Simple/lib/Test/Tester/Delegate.pm
+++ b/cpan/Test-Simple/lib/Test/Tester/Delegate.pm
@@ -3,7 +3,7 @@ use warnings;
 
 package Test::Tester::Delegate;
 
-our $VERSION = '1.302071';
+our $VERSION = '1.302073';
 
 use Scalar::Util();
 
diff --git a/cpan/Test-Simple/lib/Test/use/ok.pm b/cpan/Test-Simple/lib/Test/use/ok.pm
index ddc3a4c117..fdc7326b3d 100644
--- a/cpan/Test-Simple/lib/Test/use/ok.pm
+++ b/cpan/Test-Simple/lib/Test/use/ok.pm
@@ -1,7 +1,7 @@
 package Test::use::ok;
 use 5.005;
 
-our $VERSION = '1.302071';
+our $VERSION = '1.302073';
 
 
 __END__
diff --git a/cpan/Test-Simple/lib/Test2.pm b/cpan/Test-Simple/lib/Test2.pm
index 701b7780d7..1b65b334b5 100644
--- a/cpan/Test-Simple/lib/Test2.pm
+++ b/cpan/Test-Simple/lib/Test2.pm
@@ -2,7 +2,7 @@ package Test2;
 use strict;
 use warnings;
 
-our $VERSION = '1.302071';
+our $VERSION = '1.302073';
 
 
 1;
diff --git a/cpan/Test-Simple/lib/Test2/API.pm b/cpan/Test-Simple/lib/Test2/API.pm
index 3e54b2a3e0..41cd0af209 100644
--- a/cpan/Test-Simple/lib/Test2/API.pm
+++ b/cpan/Test-Simple/lib/Test2/API.pm
@@ -7,7 +7,7 @@ BEGIN {
     $ENV{TEST2_ACTIVE} = 1;
 }
 
-our $VERSION = '1.302071';
+our $VERSION = '1.302073';
 
 
 my $INST;
diff --git a/cpan/Test-Simple/lib/Test2/API/Breakage.pm b/cpan/Test-Simple/lib/Test2/API/Breakage.pm
index 8e0b25703e..b85e4d54c9 100644
--- a/cpan/Test-Simple/lib/Test2/API/Breakage.pm
+++ b/cpan/Test-Simple/lib/Test2/API/Breakage.pm
@@ -2,7 +2,7 @@ package Test2::API::Breakage;
 use strict;
 use warnings;
 
-our $VERSION = '1.302071';
+our $VERSION = '1.302073';
 
 
 use Test2::Util qw/pkg_to_file/;
diff --git a/cpan/Test-Simple/lib/Test2/API/Context.pm b/cpan/Test-Simple/lib/Test2/API/Context.pm
index e9844cbec9..7660fa69ea 100644
--- a/cpan/Test-Simple/lib/Test2/API/Context.pm
+++ b/cpan/Test-Simple/lib/Test2/API/Context.pm
@@ -2,7 +2,7 @@ package Test2::API::Context;
 use strict;
 use warnings;
 
-our $VERSION = '1.302071';
+our $VERSION = '1.302073';
 
 
 use Carp qw/confess croak longmess/;
diff --git a/cpan/Test-Simple/lib/Test2/API/Instance.pm b/cpan/Test-Simple/lib/Test2/API/Instance.pm
index 4489faf60b..70d4cd7bb7 100644
--- a/cpan/Test-Simple/lib/Test2/API/Instance.pm
+++ b/cpan/Test-Simple/lib/Test2/API/Instance.pm
@@ -2,7 +2,7 @@ package Test2::API::Instance;
 use strict;
 use warnings;
 
-our $VERSION = '1.302071';
+our $VERSION = '1.302073';
 
 
 our @CARP_NOT = qw/Test2::API Test2::API::Instance Test2::IPC::Driver Test2::Formatter/;
diff --git a/cpan/Test-Simple/lib/Test2/API/Stack.pm b/cpan/Test-Simple/lib/Test2/API/Stack.pm
index 6b1483e22a..534cd78d1b 100644
--- a/cpan/Test-Simple/lib/Test2/API/Stack.pm
+++ b/cpan/Test-Simple/lib/Test2/API/Stack.pm
@@ -2,7 +2,7 @@ package Test2::API::Stack;
 use strict;
 use warnings;
 
-our $VERSION = '1.302071';
+our $VERSION = '1.302073';
 
 
 use Test2::Hub();
diff --git a/cpan/Test-Simple/lib/Test2/Event.pm b/cpan/Test-Simple/lib/Test2/Event.pm
index b566952eef..a59a366081 100644
--- a/cpan/Test-Simple/lib/Test2/Event.pm
+++ b/cpan/Test-Simple/lib/Test2/Event.pm
@@ -2,7 +2,7 @@ package Test2::Event;
 use strict;
 use warnings;
 
-our $VERSION = '1.302071';
+our $VERSION = '1.302073';
 
 use Test2::Util::HashBase qw/trace nested in_subtest subtest_id/;
 use Test2::Util::ExternalMeta qw/meta get_meta set_meta delete_meta/;
diff --git a/cpan/Test-Simple/lib/Test2/Event/Bail.pm b/cpan/Test-Simple/lib/Test2/Event/Bail.pm
index e4bf5c7164..0284aecd00 100644
--- a/cpan/Test-Simple/lib/Test2/Event/Bail.pm
+++ b/cpan/Test-Simple/lib/Test2/Event/Bail.pm
@@ -2,7 +2,7 @@ package Test2::Event::Bail;
 use strict;
 use warnings;
 
-our $VERSION = '1.302071';
+our $VERSION = '1.302073';
 
 
 BEGIN { require Test2::Event; our @ISA = qw(Test2::Event) }
diff --git a/cpan/Test-Simple/lib/Test2/Event/Diag.pm b/cpan/Test-Simple/lib/Test2/Event/Diag.pm
index 674527637c..9d2ba88d6e 100644
--- a/cpan/Test-Simple/lib/Test2/Event/Diag.pm
+++ b/cpan/Test-Simple/lib/Test2/Event/Diag.pm
@@ -2,7 +2,7 @@ package Test2::Event::Diag;
 use strict;
 use warnings;
 
-our $VERSION = '1.302071';
+our $VERSION = '1.302073';
 
 
 BEGIN { require Test2::Event; our @ISA = qw(Test2::Event) }
diff --git a/cpan/Test-Simple/lib/Test2/Event/Encoding.pm b/cpan/Test-Simple/lib/Test2/Event/Encoding.pm
index 0bbd93cf94..52af3f2dc5 100644
--- a/cpan/Test-Simple/lib/Test2/Event/Encoding.pm
+++ b/cpan/Test-Simple/lib/Test2/Event/Encoding.pm
@@ -2,7 +2,7 @@ package Test2::Event::Encoding;
 use strict;
 use warnings;
 
-our $VERSION = '1.302071';
+our $VERSION = '1.302073';
 
 BEGIN { require Test2::Event; our @ISA = qw(Test2::Event) }
 use Test2::Util::HashBase qw/encoding/;
diff --git a/cpan/Test-Simple/lib/Test2/Event/Exception.pm b/cpan/Test-Simple/lib/Test2/Event/Exception.pm
index 4283c74ada..a10ca6756c 100644
--- a/cpan/Test-Simple/lib/Test2/Event/Exception.pm
+++ b/cpan/Test-Simple/lib/Test2/Event/Exception.pm
@@ -2,7 +2,7 @@ package Test2::Event::Exception;
 use strict;
 use warnings;
 
-our $VERSION = '1.302071';
+our $VERSION = '1.302073';
 
 
 BEGIN { require Test2::Event; our @ISA = qw(Test2::Event) }
diff --git a/cpan/Test-Simple/lib/Test2/Event/Generic.pm b/cpan/Test-Simple/lib/Test2/Event/Generic.pm
index 0b3901d3ce..ad00f5a963 100644
--- a/cpan/Test-Simple/lib/Test2/Event/Generic.pm
+++ b/cpan/Test-Simple/lib/Test2/Event/Generic.pm
@@ -5,7 +5,7 @@ use warnings;
 use Carp qw/croak/;
 use Scalar::Util qw/reftype/;
 
-our $VERSION = '1.302071';
+our $VERSION = '1.302073';
 
 BEGIN { require Test2::Event; our @ISA = qw(Test2::Event) }
 use Test2::Util::HashBase;
diff --git a/cpan/Test-Simple/lib/Test2/Event/Info.pm b/cpan/Test-Simple/lib/Test2/Event/Info.pm
index 4564eedfdd..51c4bbcd31 100644
--- a/cpan/Test-Simple/lib/Test2/Event/Info.pm
+++ b/cpan/Test-Simple/lib/Test2/Event/Info.pm
@@ -4,7 +4,7 @@ use warnings;
 
 use Scalar::Util qw/blessed/;
 
-our $VERSION = '1.302071';
+our $VERSION = '1.302073';
 
 BEGIN { require Test2::Event; our @ISA = qw(Test2::Event) }
 use Test2::Util::HashBase qw/diagnostics renderer/;
diff --git a/cpan/Test-Simple/lib/Test2/Event/Note.pm b/cpan/Test-Simple/lib/Test2/Event/Note.pm
index 69cb4a49c9..b9a2ded1e1 100644
--- a/cpan/Test-Simple/lib/Test2/Event/Note.pm
+++ b/cpan/Test-Simple/lib/Test2/Event/Note.pm
@@ -2,7 +2,7 @@ package Test2::Event::Note;
 use strict;
 use warnings;
 
-our $VERSION = '1.302071';
+our $VERSION = '1.302073';
 
 
 BEGIN { require Test2::Event; our @ISA = qw(Test2::Event) }
diff --git a/cpan/Test-Simple/lib/Test2/Event/Ok.pm b/cpan/Test-Simple/lib/Test2/Event/Ok.pm
index 1c107d6f6f..456d6bbcf3 100644
--- a/cpan/Test-Simple/lib/Test2/Event/Ok.pm
+++ b/cpan/Test-Simple/lib/Test2/Event/Ok.pm
@@ -2,7 +2,7 @@ package Test2::Event::Ok;
 use strict;
 use warnings;
 
-our $VERSION = '1.302071';
+our $VERSION = '1.302073';
 
 
 BEGIN { require Test2::Event; our @ISA = qw(Test2::Event) }
diff --git a/cpan/Test-Simple/lib/Test2/Event/Plan.pm b/cpan/Test-Simple/lib/Test2/Event/Plan.pm
index 0996b2863c..94b3030c34 100644
--- a/cpan/Test-Simple/lib/Test2/Event/Plan.pm
+++ b/cpan/Test-Simple/lib/Test2/Event/Plan.pm
@@ -2,7 +2,7 @@ package Test2::Event::Plan;
 use strict;
 use warnings;
 
-our $VERSION = '1.302071';
+our $VERSION = '1.302073';
 
 
 BEGIN { require Test2::Event; our @ISA = qw(Test2::Event) }
diff --git a/cpan/Test-Simple/lib/Test2/Event/Skip.pm b/cpan/Test-Simple/lib/Test2/Event/Skip.pm
index 9672be7f85..7cca06165b 100644
--- a/cpan/Test-Simple/lib/Test2/Event/Skip.pm
+++ b/cpan/Test-Simple/lib/Test2/Event/Skip.pm
@@ -2,7 +2,7 @@ package Test2::Event::Skip;
 use strict;
 use warnings;
 
-our $VERSION = '1.302071';
+our $VERSION = '1.302073';
 
 
 BEGIN { require Test2::Event::Ok; our @ISA = qw(Test2::Event::Ok) }
diff --git a/cpan/Test-Simple/lib/Test2/Event/Subtest.pm b/cpan/Test-Simple/lib/Test2/Event/Subtest.pm
index 6aefc0e157..2b3c773bf6 100644
--- a/cpan/Test-Simple/lib/Test2/Event/Subtest.pm
+++ b/cpan/Test-Simple/lib/Test2/Event/Subtest.pm
@@ -2,7 +2,7 @@ package Test2::Event::Subtest;
 use strict;
 use warnings;
 
-our $VERSION = '1.302071';
+our $VERSION = '1.302073';
 
 
 BEGIN { require Test2::Event::Ok; our @ISA = qw(Test2::Event::Ok) }
diff --git a/cpan/Test-Simple/lib/Test2/Event/TAP/Version.pm b/cpan/Test-Simple/lib/Test2/Event/TAP/Version.pm
index 05ea9a5613..b96a25adde 100644
--- a/cpan/Test-Simple/lib/Test2/Event/TAP/Version.pm
+++ b/cpan/Test-Simple/lib/Test2/Event/TAP/Version.pm
@@ -2,7 +2,7 @@ package Test2::Event::TAP::Version;
 use strict;
 use warnings;
 
-our $VERSION = '1.302071';
+our $VERSION = '1.302073';
 
 BEGIN { require Test2::Event; our @ISA = qw(Test2::Event) }
 use Test2::Util::HashBase qw/version/;
diff --git a/cpan/Test-Simple/lib/Test2/Event/Waiting.pm b/cpan/Test-Simple/lib/Test2/Event/Waiting.pm
index 372de9e424..fa87c6e8dd 100644
--- a/cpan/Test-Simple/lib/Test2/Event/Waiting.pm
+++ b/cpan/Test-Simple/lib/Test2/Event/Waiting.pm
@@ -2,7 +2,7 @@ package Test2::Event::Waiting;
 use strict;
 use warnings;
 
-our $VERSION = '1.302071';
+our $VERSION = '1.302073';
 
 
 BEGIN { require Test2::Event; our @ISA = qw(Test2::Event) }
diff --git a/cpan/Test-Simple/lib/Test2/Formatter.pm b/cpan/Test-Simple/lib/Test2/Formatter.pm
index 1ad9e44958..945d545dd6 100644
--- a/cpan/Test-Simple/lib/Test2/Formatter.pm
+++ b/cpan/Test-Simple/lib/Test2/Formatter.pm
@@ -2,7 +2,7 @@ package Test2::Formatter;
 use strict;
 use warnings;
 
-our $VERSION = '1.302071';
+our $VERSION = '1.302073';
 
 
 my %ADDED;
diff --git a/cpan/Test-Simple/lib/Test2/Formatter/TAP.pm b/cpan/Test-Simple/lib/Test2/Formatter/TAP.pm
index b37d31beba..680095cfed 100644
--- a/cpan/Test-Simple/lib/Test2/Formatter/TAP.pm
+++ b/cpan/Test-Simple/lib/Test2/Formatter/TAP.pm
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 require PerlIO;
 
-our $VERSION = '1.302071';
+our $VERSION = '1.302073';
 
 use Test2::Util::HashBase qw{
     no_numbers handles _encoding
diff --git a/cpan/Test-Simple/lib/Test2/Hub.pm b/cpan/Test-Simple/lib/Test2/Hub.pm
index 20fb035de5..324f1a87bb 100644
--- a/cpan/Test-Simple/lib/Test2/Hub.pm
+++ b/cpan/Test-Simple/lib/Test2/Hub.pm
@@ -2,7 +2,7 @@ package Test2::Hub;
 use strict;
 use warnings;
 
-our $VERSION = '1.302071';
+our $VERSION = '1.302073';
 
 
 use Carp qw/carp croak confess/;
diff --git a/cpan/Test-Simple/lib/Test2/Hub/Interceptor.pm b/cpan/Test-Simple/lib/Test2/Hub/Interceptor.pm
index 036c37002e..42be265f8d 100644
--- a/cpan/Test-Simple/lib/Test2/Hub/Interceptor.pm
+++ b/cpan/Test-Simple/lib/Test2/Hub/Interceptor.pm
@@ -2,7 +2,7 @@ package Test2::Hub::Interceptor;
 use strict;
 use warnings;
 
-our $VERSION = '1.302071';
+our $VERSION = '1.302073';
 
 
 use Test2::Hub::Interceptor::Terminator();
diff --git a/cpan/Test-Simple/lib/Test2/Hub/Interceptor/Terminator.pm b/cpan/Test-Simple/lib/Test2/Hub/Interceptor/Terminator.pm
index 785cca7043..f720190468 100644
--- a/cpan/Test-Simple/lib/Test2/Hub/Interceptor/Terminator.pm
+++ b/cpan/Test-Simple/lib/Test2/Hub/Interceptor/Terminator.pm
@@ -2,7 +2,7 @@ package Test2::Hub::Interceptor::Terminator;
 use strict;
 use warnings;
 
-our $VERSION = '1.302071';
+our $VERSION = '1.302073';
 
 
 1;
diff --git a/cpan/Test-Simple/lib/Test2/Hub/Subtest.pm b/cpan/Test-Simple/lib/Test2/Hub/Subtest.pm
index 5704a4f8bf..adb3d6f15e 100644
--- a/cpan/Test-Simple/lib/Test2/Hub/Subtest.pm
+++ b/cpan/Test-Simple/lib/Test2/Hub/Subtest.pm
@@ -2,7 +2,7 @@ package Test2::Hub::Subtest;
 use strict;
 use warnings;
 
-our $VERSION = '1.302071';
+our $VERSION = '1.302073';
 
 
 BEGIN { require Test2::Hub; our @ISA = qw(Test2::Hub) }
diff --git a/cpan/Test-Simple/lib/Test2/IPC.pm b/cpan/Test-Simple/lib/Test2/IPC.pm
index 67707aff5e..92447919c1 100644
--- a/cpan/Test-Simple/lib/Test2/IPC.pm
+++ b/cpan/Test-Simple/lib/Test2/IPC.pm
@@ -2,7 +2,7 @@ package Test2::IPC;
 use strict;
 use warnings;
 
-our $VERSION = '1.302071';
+our $VERSION = '1.302073';
 
 
 use Test2::API::Instance;
diff --git a/cpan/Test-Simple/lib/Test2/IPC/Driver.pm b/cpan/Test-Simple/lib/Test2/IPC/Driver.pm
index 68b186c60c..cd34f7c025 100644
--- a/cpan/Test-Simple/lib/Test2/IPC/Driver.pm
+++ b/cpan/Test-Simple/lib/Test2/IPC/Driver.pm
@@ -2,7 +2,7 @@ package Test2::IPC::Driver;
 use strict;
 use warnings;
 
-our $VERSION = '1.302071';
+our $VERSION = '1.302073';
 
 
 use Carp qw/confess longmess/;
diff --git a/cpan/Test-Simple/lib/Test2/IPC/Driver/Files.pm b/cpan/Test-Simple/lib/Test2/IPC/Driver/Files.pm
index cdfbba569e..998fef5637 100644
--- a/cpan/Test-Simple/lib/Test2/IPC/Driver/Files.pm
+++ b/cpan/Test-Simple/lib/Test2/IPC/Driver/Files.pm
@@ -2,7 +2,7 @@ package Test2::IPC::Driver::Files;
 use strict;
 use warnings;
 
-our $VERSION = '1.302071';
+our $VERSION = '1.302073';
 
 
 BEGIN { require Test2::IPC::Driver; our @ISA = qw(Test2::IPC::Driver) }
diff --git a/cpan/Test-Simple/t/tools.pl b/cpan/Test-Simple/lib/Test2/Tools/Tiny.pm
index a5afc482ac..857a923c6a 100644
--- a/cpan/Test-Simple/t/tools.pl
+++ b/cpan/Test-Simple/lib/Test2/Tools/Tiny.pm
@@ -1,3 +1,7 @@
+package Test2::Tools::Tiny;
+use strict;
+use warnings;
+
 use Scalar::Util qw/blessed/;
 
 use Test2::Util qw/try/;
@@ -6,6 +10,14 @@ use Test2::API qw/context run_subtest test2_stack/;
 use Test2::Hub::Interceptor();
 use Test2::Hub::Interceptor::Terminator();
 
+our $VERSION = '1.302073';
+
+BEGIN { require Exporter; our @ISA = qw(Exporter) }
+our @EXPORT = qw{
+    ok is isnt like unlike is_deeply diag note skip_all todo plan done_testing
+    warnings exception tests capture
+};
+
 sub ok($;$@) {
     my ($bool, $name, @diag) = @_;
     my $ctx = context();
@@ -25,7 +37,7 @@ sub is($$;$@) {
     elsif (defined($got) xor defined($want)) {
         $bool = 0;
     }
-    else { # Both are undef
+    else {    # Both are undef
         $bool = 1;
     }
 
@@ -54,7 +66,7 @@ sub isnt($$;$@) {
     elsif (defined($got) xor defined($want)) {
         $bool = 1;
     }
-    else { # Both are undef
+    else {    # Both are undef
         $bool = 0;
     }
 
@@ -119,8 +131,8 @@ sub is_deeply($$;$@) {
     require Data::Dumper;
     local $Data::Dumper::Sortkeys = 1;
     local $Data::Dumper::Deparse  = 1;
-    local $Data::Dumper::Freezer = 'XXX';
-    local *UNIVERSAL::XXX = sub {
+    local $Data::Dumper::Freezer  = 'XXX';
+    local *UNIVERSAL::XXX         = sub {
         my ($thing) = @_;
         if (ref($thing)) {
             $thing = {%$thing}  if "$thing" =~ m/=HASH/;
@@ -136,17 +148,6 @@ sub is_deeply($$;$@) {
     my $bool = $g eq $w;
 
     my $diff;
-#    unless ($bool) {
-#        use File::Temp;
-#        my ($gFH, $fileg) = File::Temp::tempfile();
-#        my ($wFH, $filew) = File::Temp::tempfile();
-#        print $gFH $g;
-#        print $wFH $w;
-#        close($gFH) || die $!;
-#        close($wFH) || die $!;
-#        my $cmd = qq{git diff --color=always "$fileg" "$filew"};
-#        $diff = eval { `$cmd` };
-#    }
 
     $ctx->ok($bool, $name, [$diff ? $diff : ($g, $w), @diag]);
     $ctx->release;
@@ -155,13 +156,13 @@ sub is_deeply($$;$@) {
 
 sub diag {
     my $ctx = context();
-    $ctx->diag( join '', @_ );
+    $ctx->diag(join '', @_);
     $ctx->release;
 }
 
 sub note {
     my $ctx = context();
-    $ctx->note( join '', @_ );
+    $ctx->note(join '', @_);
     $ctx->release;
 }
 
@@ -173,34 +174,34 @@ sub skip_all {
 }
 
 sub todo {
-	my ($reason, $sub) = @_;
-	my $ctx = context();
-
-	# This code is mostly copied from Test2::Todo in the Test2-Suite
-	# distribution.
-	my $hub    = test2_stack->top;
-	my $filter = $hub->pre_filter(
-		sub {
-			my ($active_hub, $event) = @_;
-
-			# Turn a diag into a note
-			return Test2::Event::Note->new(%$event) if ref($event) eq 'Test2::Event::Diag';
-
-			# Set todo on ok's
-			if ($hub == $active_hub && $event->isa('Test2::Event::Ok')) {
-				$event->set_todo($reason);
-				$event->set_effective_pass(1);
-			}
-
-			return $event;
-		},
-		inherit => 1,
-		todo    => $reason,
-	);
-	$sub->();
-	$hub->pre_unfilter($filter);
-
-	$ctx->release if $ctx;
+    my ($reason, $sub) = @_;
+    my $ctx = context();
+
+    # This code is mostly copied from Test2::Todo in the Test2-Suite
+    # distribution.
+    my $hub    = test2_stack->top;
+    my $filter = $hub->pre_filter(
+        sub {
+            my ($active_hub, $event) = @_;
+
+            # Turn a diag into a note
+            return Test2::Event::Note->new(%$event) if ref($event) eq 'Test2::Event::Diag';
+
+            # Set todo on ok's
+            if ($hub == $active_hub && $event->isa('Test2::Event::Ok')) {
+                $event->set_todo($reason);
+                $event->set_effective_pass(1);
+            }
+
+            return $event;
+        },
+        inherit => 1,
+        todo    => $reason,
+    );
+    $sub->();
+    $hub->pre_unfilter($filter);
+
+    $ctx->release if $ctx;
 }
 
 sub plan {
@@ -278,3 +279,147 @@ sub capture(&) {
 }
 
 1;
+
+__END__
+
+=pod
+
+=encoding UTF-8
+
+=head1 NAME
+
+Test2::Tools::Tiny - Tiny set of tools for unfortunate souls who cannot use
+L<Test2::Suite>.
+
+=head1 DESCRIPTION
+
+You should really look at L<Test2::Suite>. This package is some very basic
+essential tools implemented using L<Test2>. This exists only so that L<Test2>
+and other tools required by L<Test2::Suite> can be tested. This is the package
+L<Test2> uses to test itself.
+
+=head1 USE Test2::Suite INSTEAD
+
+Use L<Test2::Suite> if at all possible.
+
+=head1 EXPORTS
+
+=over 4
+
+=item ok($bool, $name)
+
+=item ok($bool, $name, @diag)
+
+Run a simple assertion.
+
+=item is($got, $want, $name)
+
+=item is($got, $want, $name, @diag)
+
+Assert that 2 strings are the same.
+
+=item isnt($got, $do_not_want, $name)
+
+=item isnt($got, $do_not_want, $name, @diag)
+
+Assert that 2 strings are not the same.
+
+=item like($got, $regex, $name)
+
+=item like($got, $regex, $name, @diag)
+
+Check that the input string matches the regex.
+
+=item unlike($got, $regex, $name)
+
+=item unlike($got, $regex, $name, @diag)
+
+Check that the input string does not match the regex.
+
+=item is_deeply($got, $want, $name)
+
+=item is_deeply($got, $want, $name, @diag)
+
+Check 2 data structures. Please note that this is a I<DUMB> implementation that
+compares the output of L<Data::Dumper> against both structures.
+
+=item diag($msg)
+
+Issue a diagnostics message to STDERR.
+
+=item note($msg)
+
+Issue a diagnostics message to STDOUT.
+
+=item skip_all($reason)
+
+Skip all tests.
+
+=item todo $reason => sub { ... }
+
+Run a block in TODO mode.
+
+=item plan($count)
+
+Set the plan.
+
+=item done_testing()
+
+Set the plan to the current test count.
+
+=item $warnings = warnings { ... }
+
+Capture an arrayref of warnings from the block.
+
+=item $exception = exception { ... }
+
+Capture an exception.
+
+=item tests $name => sub { ... }
+
+Run a subtest.
+
+=item $output = capture { ... }
+
+Capture STDOUT and STDERR output.
+
+Result looks like this:
+
+    {
+        STDOUT => "...",
+        STDERR => "...",
+    }
+
+=back
+
+=head1 SOURCE
+
+The source code repository for Test2 can be found at
+F<http://github.com/Test-More/test-more/>.
+
+=head1 MAINTAINERS
+
+=over 4
+
+=item Chad Granum E<lt>exodist@cpan.orgE<gt>
+
+=back
+
+=head1 AUTHORS
+
+=over 4
+
+=item Chad Granum E<lt>exodist@cpan.orgE<gt>
+
+=back
+
+=head1 COPYRIGHT
+
+Copyright 2016 Chad Granum E<lt>exodist@cpan.orgE<gt>.
+
+This program is free software; you can redistribute it and/or
+modify it under the same terms as Perl itself.
+
+See F<http://dev.perl.org/licenses/>
+
+=cut
diff --git a/cpan/Test-Simple/lib/Test2/Util.pm b/cpan/Test-Simple/lib/Test2/Util.pm
index 0a23de27b3..53379d41dd 100644
--- a/cpan/Test-Simple/lib/Test2/Util.pm
+++ b/cpan/Test-Simple/lib/Test2/Util.pm
@@ -2,7 +2,7 @@ package Test2::Util;
 use strict;
 use warnings;
 
-our $VERSION = '1.302071';
+our $VERSION = '1.302073';
 
 
 use Config qw/%Config/;
diff --git a/cpan/Test-Simple/lib/Test2/Util/ExternalMeta.pm b/cpan/Test-Simple/lib/Test2/Util/ExternalMeta.pm
index bc62d7b73b..f9c611e0f2 100644
--- a/cpan/Test-Simple/lib/Test2/Util/ExternalMeta.pm
+++ b/cpan/Test-Simple/lib/Test2/Util/ExternalMeta.pm
@@ -2,7 +2,7 @@ package Test2::Util::ExternalMeta;
 use strict;
 use warnings;
 
-our $VERSION = '1.302071';
+our $VERSION = '1.302073';
 
 
 use Carp qw/croak/;
diff --git a/cpan/Test-Simple/lib/Test2/Util/Trace.pm b/cpan/Test-Simple/lib/Test2/Util/Trace.pm
index 20bce5602f..0f10bcb6ad 100644
--- a/cpan/Test-Simple/lib/Test2/Util/Trace.pm
+++ b/cpan/Test-Simple/lib/Test2/Util/Trace.pm
@@ -2,7 +2,7 @@ package Test2::Util::Trace;
 use strict;
 use warnings;
 
-our $VERSION = '1.302071';
+our $VERSION = '1.302073';
 
 
 use Test2::Util qw/get_tid pkg_to_file/;
diff --git a/cpan/Test-Simple/lib/ok.pm b/cpan/Test-Simple/lib/ok.pm
index 0d82054551..143885dd53 100644
--- a/cpan/Test-Simple/lib/ok.pm
+++ b/cpan/Test-Simple/lib/ok.pm
@@ -1,5 +1,5 @@
 package ok;
-our $VERSION = '1.302071';
+our $VERSION = '1.302073';
 
 use strict;
 use Test::More ();
diff --git a/cpan/Test-Simple/t/Legacy_And_Test2/builder_loaded_late.t b/cpan/Test-Simple/t/Legacy_And_Test2/builder_loaded_late.t
index 37d755bce4..21c712b5e4 100644
--- a/cpan/Test-Simple/t/Legacy_And_Test2/builder_loaded_late.t
+++ b/cpan/Test-Simple/t/Legacy_And_Test2/builder_loaded_late.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-BEGIN { require "t/tools.pl" };
+use Test2::Tools::Tiny;
 use Test2::API qw/intercept/;
 
 plan 4;
diff --git a/cpan/Test-Simple/t/Legacy_And_Test2/hidden_warnings.t b/cpan/Test-Simple/t/Legacy_And_Test2/hidden_warnings.t
index a487ab561d..1819be3399 100644
--- a/cpan/Test-Simple/t/Legacy_And_Test2/hidden_warnings.t
+++ b/cpan/Test-Simple/t/Legacy_And_Test2/hidden_warnings.t
@@ -1,6 +1,6 @@
 use strict;
 use warnings;
-BEGIN { require "t/tools.pl" };
+use Test2::Tools::Tiny;
 use Test2::API qw( context_do );
 
 $SIG{__WARN__} = sub {
diff --git a/cpan/Test-Simple/t/Test2/behavior/Formatter.t b/cpan/Test-Simple/t/Test2/behavior/Formatter.t
index 24bd6c24b5..f38b022ebe 100644
--- a/cpan/Test-Simple/t/Test2/behavior/Formatter.t
+++ b/cpan/Test-Simple/t/Test2/behavior/Formatter.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-BEGIN { require "t/tools.pl" }
+use Test2::Tools::Tiny;
 
 use Test2::API qw/intercept run_subtest test2_stack/;
 use Test2::Event::Bail;
diff --git a/cpan/Test-Simple/t/Test2/behavior/Subtest_buffer_formatter.t b/cpan/Test-Simple/t/Test2/behavior/Subtest_buffer_formatter.t
index 2fc58ef5f0..fadebf4929 100644
--- a/cpan/Test-Simple/t/Test2/behavior/Subtest_buffer_formatter.t
+++ b/cpan/Test-Simple/t/Test2/behavior/Subtest_buffer_formatter.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-BEGIN { require "t/tools.pl" };
+use Test2::Tools::Tiny;
 
 use Test2::API qw/run_subtest intercept test2_stack/;
 
diff --git a/cpan/Test-Simple/t/Test2/behavior/Subtest_events.t b/cpan/Test-Simple/t/Test2/behavior/Subtest_events.t
index 8113dd9078..2d1dade0a6 100644
--- a/cpan/Test-Simple/t/Test2/behavior/Subtest_events.t
+++ b/cpan/Test-Simple/t/Test2/behavior/Subtest_events.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-BEGIN { require "t/tools.pl" };
+use Test2::Tools::Tiny;
 
 use Test2::API qw/run_subtest intercept/;
 
diff --git a/cpan/Test-Simple/t/Test2/behavior/Subtest_plan.t b/cpan/Test-Simple/t/Test2/behavior/Subtest_plan.t
index f3dab3ca6a..f16f7c4803 100644
--- a/cpan/Test-Simple/t/Test2/behavior/Subtest_plan.t
+++ b/cpan/Test-Simple/t/Test2/behavior/Subtest_plan.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-BEGIN { require "t/tools.pl" };
+use Test2::Tools::Tiny;
 
 use Test2::API qw/run_subtest intercept/;
 
diff --git a/cpan/Test-Simple/t/Test2/behavior/Subtest_todo.t b/cpan/Test-Simple/t/Test2/behavior/Subtest_todo.t
index 2ee0608e62..cafc712c62 100644
--- a/cpan/Test-Simple/t/Test2/behavior/Subtest_todo.t
+++ b/cpan/Test-Simple/t/Test2/behavior/Subtest_todo.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-BEGIN { require "t/tools.pl" }
+use Test2::Tools::Tiny;
 
 use Test2::API qw/run_subtest intercept/;
 
diff --git a/cpan/Test-Simple/t/Test2/behavior/err_var.t b/cpan/Test-Simple/t/Test2/behavior/err_var.t
index 7d8bc7c4ee..1e1bfef39e 100644
--- a/cpan/Test-Simple/t/Test2/behavior/err_var.t
+++ b/cpan/Test-Simple/t/Test2/behavior/err_var.t
@@ -3,7 +3,7 @@ use warnings;
 
 use Test2::IPC;
 
-BEGIN { require "t/tools.pl" };
+use Test2::Tools::Tiny;
 
 {
     local $! = 100;
diff --git a/cpan/Test-Simple/t/Test2/behavior/init_croak.t b/cpan/Test-Simple/t/Test2/behavior/init_croak.t
index e8eb44b8ac..dc49283193 100644
--- a/cpan/Test-Simple/t/Test2/behavior/init_croak.t
+++ b/cpan/Test-Simple/t/Test2/behavior/init_croak.t
@@ -1,6 +1,6 @@
 use strict;
 use warnings;
-BEGIN { require "t/tools.pl" };
+use Test2::Tools::Tiny;
 
 BEGIN {
     package Foo::Bar;
diff --git a/cpan/Test-Simple/t/Test2/behavior/nested_context_exception.t b/cpan/Test-Simple/t/Test2/behavior/nested_context_exception.t
index 04cbdb8067..55db247f4a 100644
--- a/cpan/Test-Simple/t/Test2/behavior/nested_context_exception.t
+++ b/cpan/Test-Simple/t/Test2/behavior/nested_context_exception.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 BEGIN { $Test2::API::DO_DEPTH_CHECK = 1 }
-BEGIN { require "t/tools.pl" };
+use Test2::Tools::Tiny;
 
 use Test2::API qw/context/;
 
diff --git a/cpan/Test-Simple/t/Test2/behavior/no_load_api.t b/cpan/Test-Simple/t/Test2/behavior/no_load_api.t
index 8bf54c95f7..8e01e409ea 100644
--- a/cpan/Test-Simple/t/Test2/behavior/no_load_api.t
+++ b/cpan/Test-Simple/t/Test2/behavior/no_load_api.t
@@ -42,9 +42,9 @@ my @loaded = grep { $INC{$_} } qw{
     Test2/API/Stack.pm
 };
 
-require "t/tools.pl";
+require Test2::Tools::Tiny;
 
-ok(!@loaded, "Test2::API was not loaded")
+Test2::Tools::Tiny::ok(!@loaded, "Test2::API was not loaded")
     || diag("Loaded: " . Dumper(\@loaded));
 
-done_testing();
+Test2::Tools::Tiny::done_testing();
diff --git a/cpan/Test-Simple/t/Test2/behavior/run_subtest_inherit.t b/cpan/Test-Simple/t/Test2/behavior/run_subtest_inherit.t
index 3f15bc82a9..5a79ee412d 100644
--- a/cpan/Test-Simple/t/Test2/behavior/run_subtest_inherit.t
+++ b/cpan/Test-Simple/t/Test2/behavior/run_subtest_inherit.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-BEGIN { require "t/tools.pl" };
+use Test2::Tools::Tiny;
 
 use Test2::API qw/run_subtest intercept context/;
 
diff --git a/cpan/Test-Simple/t/Test2/behavior/special_names.t b/cpan/Test-Simple/t/Test2/behavior/special_names.t
index b748cfac27..4cf10e5f96 100644
--- a/cpan/Test-Simple/t/Test2/behavior/special_names.t
+++ b/cpan/Test-Simple/t/Test2/behavior/special_names.t
@@ -2,7 +2,7 @@ use strict;
 use warnings;
 # HARNESS-NO-FORMATTER
 
-BEGIN { require "t/tools.pl" };
+use Test2::Tools::Tiny;
 
 #########################
 #
diff --git a/cpan/Test-Simple/t/Test2/legacy/TAP.t b/cpan/Test-Simple/t/Test2/legacy/TAP.t
index 84bb18a170..e58a5ff1fb 100644
--- a/cpan/Test-Simple/t/Test2/legacy/TAP.t
+++ b/cpan/Test-Simple/t/Test2/legacy/TAP.t
@@ -2,7 +2,7 @@ use strict;
 use warnings;
 # HARNESS-NO-FORMATTER
 
-BEGIN { require "t/tools.pl" };
+use Test2::Tools::Tiny;
 
 #########################
 #
@@ -11,11 +11,11 @@ BEGIN { require "t/tools.pl" };
 #
 #########################
 
-use Test2::API qw/test2_stack/;
+use Test2::API qw/test2_stack context/;
 use Test::Builder::Formatter;
 
-# The tools in tools.pl have some intentional differences from the Test::More
-# versions, these behave more like Test::More which is important for
+# The tools in Test2::Tools::Tiny have some intentional differences from the
+# Test::More versions, these behave more like Test::More which is important for
 # back-compat.
 sub tm_ok($;$) {
     my ($bool, $name) = @_;
diff --git a/cpan/Test-Simple/t/Test2/modules/API.t b/cpan/Test-Simple/t/Test2/modules/API.t
index c206c04d6d..27790aa0ba 100644
--- a/cpan/Test-Simple/t/Test2/modules/API.t
+++ b/cpan/Test-Simple/t/Test2/modules/API.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test2::API;
+use Test2::API qw/context/;
 
 my ($LOADED, $INIT);
 BEGIN {
@@ -10,7 +10,7 @@ BEGIN {
 };
 
 use Test2::IPC;
-BEGIN { require "t/tools.pl" };
+use Test2::Tools::Tiny;
 use Test2::Util qw/get_tid/;
 my $CLASS = 'Test2::API';
 
diff --git a/cpan/Test-Simple/t/Test2/modules/API/Breakage.t b/cpan/Test-Simple/t/Test2/modules/API/Breakage.t
index 2069c93626..e2932469f3 100644
--- a/cpan/Test-Simple/t/Test2/modules/API/Breakage.t
+++ b/cpan/Test-Simple/t/Test2/modules/API/Breakage.t
@@ -2,7 +2,7 @@ use strict;
 use warnings;
 
 use Test2::IPC;
-BEGIN { require "t/tools.pl" };
+use Test2::Tools::Tiny;
 use Test2::API::Breakage;
 my $CLASS = 'Test2::API::Breakage';
 
diff --git a/cpan/Test-Simple/t/Test2/modules/API/Context.t b/cpan/Test-Simple/t/Test2/modules/API/Context.t
index f6842f1a09..c0dbfc93ea 100644
--- a/cpan/Test-Simple/t/Test2/modules/API/Context.t
+++ b/cpan/Test-Simple/t/Test2/modules/API/Context.t
@@ -2,7 +2,7 @@ use strict;
 use warnings;
 
 BEGIN { $Test2::API::DO_DEPTH_CHECK = 1 }
-BEGIN { require "t/tools.pl" };
+use Test2::Tools::Tiny;
 
 use Test2::API qw{
     context intercept
diff --git a/cpan/Test-Simple/t/Test2/modules/API/Instance.t b/cpan/Test-Simple/t/Test2/modules/API/Instance.t
index 294224cefc..9e3e4ccd4d 100644
--- a/cpan/Test-Simple/t/Test2/modules/API/Instance.t
+++ b/cpan/Test-Simple/t/Test2/modules/API/Instance.t
@@ -2,7 +2,7 @@ use strict;
 use warnings;
 
 use Test2::IPC;
-BEGIN { require "t/tools.pl" };
+use Test2::Tools::Tiny;
 use Test2::Util qw/CAN_THREAD CAN_REALLY_FORK USE_THREADS get_tid/;
 
 my $CLASS = 'Test2::API::Instance';
diff --git a/cpan/Test-Simple/t/Test2/modules/API/Stack.t b/cpan/Test-Simple/t/Test2/modules/API/Stack.t
index 731022e8b0..c2016e292e 100644
--- a/cpan/Test-Simple/t/Test2/modules/API/Stack.t
+++ b/cpan/Test-Simple/t/Test2/modules/API/Stack.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 use Test2::IPC;
-BEGIN { require "t/tools.pl" };
+use Test2::Tools::Tiny;
 use Test2::API::Stack;
 use Test2::API qw/test2_ipc/;
 
diff --git a/cpan/Test-Simple/t/Test2/modules/Event.t b/cpan/Test-Simple/t/Test2/modules/Event.t
index 323972aa27..467e724984 100644
--- a/cpan/Test-Simple/t/Test2/modules/Event.t
+++ b/cpan/Test-Simple/t/Test2/modules/Event.t
@@ -1,6 +1,6 @@
 use strict;
 use warnings;
-BEGIN { require "t/tools.pl" };
+use Test2::Tools::Tiny;
 
 use Test2::Event();
 
diff --git a/cpan/Test-Simple/t/Test2/modules/Event/Bail.t b/cpan/Test-Simple/t/Test2/modules/Event/Bail.t
index 0d69f43f6f..d323bd9d97 100644
--- a/cpan/Test-Simple/t/Test2/modules/Event/Bail.t
+++ b/cpan/Test-Simple/t/Test2/modules/Event/Bail.t
@@ -1,6 +1,6 @@
 use strict;
 use warnings;
-BEGIN { require "t/tools.pl" };
+use Test2::Tools::Tiny;
 use Test2::Event::Bail;
 
 my $bail = Test2::Event::Bail->new(
diff --git a/cpan/Test-Simple/t/Test2/modules/Event/Diag.t b/cpan/Test-Simple/t/Test2/modules/Event/Diag.t
index eb38554988..9094c0af18 100644
--- a/cpan/Test-Simple/t/Test2/modules/Event/Diag.t
+++ b/cpan/Test-Simple/t/Test2/modules/Event/Diag.t
@@ -1,6 +1,6 @@
 use strict;
 use warnings;
-BEGIN { require "t/tools.pl" };
+use Test2::Tools::Tiny;
 use Test2::Event::Diag;
 use Test2::Util::Trace;
 
diff --git a/cpan/Test-Simple/t/Test2/modules/Event/Exception.t b/cpan/Test-Simple/t/Test2/modules/Event/Exception.t
index d9082ad795..b2bcb6f2db 100644
--- a/cpan/Test-Simple/t/Test2/modules/Event/Exception.t
+++ b/cpan/Test-Simple/t/Test2/modules/Event/Exception.t
@@ -1,6 +1,6 @@
 use strict;
 use warnings;
-BEGIN { require "t/tools.pl" };
+use Test2::Tools::Tiny;
 use Test2::Event::Exception;
 
 my $exception = Test2::Event::Exception->new(
diff --git a/cpan/Test-Simple/t/Test2/modules/Event/Generic.t b/cpan/Test-Simple/t/Test2/modules/Event/Generic.t
index 4838d55c77..5598bee0ba 100644
--- a/cpan/Test-Simple/t/Test2/modules/Event/Generic.t
+++ b/cpan/Test-Simple/t/Test2/modules/Event/Generic.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-BEGIN { require "t/tools.pl" };
+use Test2::Tools::Tiny;
 use Test2::Util::Trace;
 
 use Test2::API qw/context intercept/;
diff --git a/cpan/Test-Simple/t/Test2/modules/Event/Info.t b/cpan/Test-Simple/t/Test2/modules/Event/Info.t
index 64dff5c5ff..d908547b01 100644
--- a/cpan/Test-Simple/t/Test2/modules/Event/Info.t
+++ b/cpan/Test-Simple/t/Test2/modules/Event/Info.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-BEGIN { require "t/tools.pl" };
+use Test2::Tools::Tiny;
 
 use Test2::Event::Info;
 use Test2::Util::Trace;
diff --git a/cpan/Test-Simple/t/Test2/modules/Event/Note.t b/cpan/Test-Simple/t/Test2/modules/Event/Note.t
index cac7da9e7f..0292986aab 100644
--- a/cpan/Test-Simple/t/Test2/modules/Event/Note.t
+++ b/cpan/Test-Simple/t/Test2/modules/Event/Note.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-BEGIN { require "t/tools.pl" };
+use Test2::Tools::Tiny;
 use Test2::Event::Note;
 use Test2::Util::Trace;
 
diff --git a/cpan/Test-Simple/t/Test2/modules/Event/Ok.t b/cpan/Test-Simple/t/Test2/modules/Event/Ok.t
index ad4a1cc21d..01c255cb1b 100644
--- a/cpan/Test-Simple/t/Test2/modules/Event/Ok.t
+++ b/cpan/Test-Simple/t/Test2/modules/Event/Ok.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-BEGIN { require "t/tools.pl" };
+use Test2::Tools::Tiny;
 use Test2::Util::Trace;
 use Test2::Event::Ok;
 use Test2::Event::Diag;
diff --git a/cpan/Test-Simple/t/Test2/modules/Event/Plan.t b/cpan/Test-Simple/t/Test2/modules/Event/Plan.t
index 33a5950773..25db4a57bf 100644
--- a/cpan/Test-Simple/t/Test2/modules/Event/Plan.t
+++ b/cpan/Test-Simple/t/Test2/modules/Event/Plan.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-BEGIN { require "t/tools.pl" };
+use Test2::Tools::Tiny;
 use Test2::Event::Plan;
 use Test2::Util::Trace;
 
diff --git a/cpan/Test-Simple/t/Test2/modules/Event/Skip.t b/cpan/Test-Simple/t/Test2/modules/Event/Skip.t
index a1580202db..89018794ee 100644
--- a/cpan/Test-Simple/t/Test2/modules/Event/Skip.t
+++ b/cpan/Test-Simple/t/Test2/modules/Event/Skip.t
@@ -1,4 +1,4 @@
-BEGIN { require "t/tools.pl" };
+use Test2::Tools::Tiny;
 use strict;
 use warnings;
 
diff --git a/cpan/Test-Simple/t/Test2/modules/Event/Subtest.t b/cpan/Test-Simple/t/Test2/modules/Event/Subtest.t
index d6bff4d3b6..56e1184079 100644
--- a/cpan/Test-Simple/t/Test2/modules/Event/Subtest.t
+++ b/cpan/Test-Simple/t/Test2/modules/Event/Subtest.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-BEGIN { require "t/tools.pl" };
+use Test2::Tools::Tiny;
 use Test2::Event::Subtest;
 my $st = 'Test2::Event::Subtest';
 
diff --git a/cpan/Test-Simple/t/Test2/modules/Event/Waiting.t b/cpan/Test-Simple/t/Test2/modules/Event/Waiting.t
index cc54895dae..26b7fbb41f 100644
--- a/cpan/Test-Simple/t/Test2/modules/Event/Waiting.t
+++ b/cpan/Test-Simple/t/Test2/modules/Event/Waiting.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-BEGIN { require "t/tools.pl" };
+use Test2::Tools::Tiny;
 use Test2::Event::Waiting;
 
 my $waiting = Test2::Event::Waiting->new(
diff --git a/cpan/Test-Simple/t/Test2/modules/Formatter/TAP.t b/cpan/Test-Simple/t/Test2/modules/Formatter/TAP.t
index a232186831..2cf92b8270 100644
--- a/cpan/Test-Simple/t/Test2/modules/Formatter/TAP.t
+++ b/cpan/Test-Simple/t/Test2/modules/Formatter/TAP.t
@@ -4,8 +4,9 @@ use Test2::Formatter::TAP;
 use Test2::API qw/context/;
 use PerlIO;
 
+use Test2::Tools::Tiny;
+
 BEGIN {
-    require "t/tools.pl";
     *OUT_STD = Test2::Formatter::TAP->can('OUT_STD') or die;
     *OUT_ERR = Test2::Formatter::TAP->can('OUT_ERR') or die;
 }
diff --git a/cpan/Test-Simple/t/Test2/modules/Hub.t b/cpan/Test-Simple/t/Test2/modules/Hub.t
index 4ed48bb61b..1d31a6097f 100644
--- a/cpan/Test-Simple/t/Test2/modules/Hub.t
+++ b/cpan/Test-Simple/t/Test2/modules/Hub.t
@@ -2,7 +2,7 @@ use strict;
 use warnings;
 
 use Test2::IPC;
-BEGIN { require "t/tools.pl" };
+use Test2::Tools::Tiny;
 use Test2::API qw/context test2_ipc_drivers/;
 use Test2::Util qw/CAN_FORK CAN_THREAD CAN_REALLY_FORK/;
 
diff --git a/cpan/Test-Simple/t/Test2/modules/Hub/Interceptor.t b/cpan/Test-Simple/t/Test2/modules/Hub/Interceptor.t
index a8b21545f0..71cd56a6ce 100644
--- a/cpan/Test-Simple/t/Test2/modules/Hub/Interceptor.t
+++ b/cpan/Test-Simple/t/Test2/modules/Hub/Interceptor.t
@@ -1,6 +1,6 @@
 use strict;
 use warnings;
-BEGIN { require "t/tools.pl" };
+use Test2::Tools::Tiny;
 
 use Test2::Hub::Interceptor;
 
diff --git a/cpan/Test-Simple/t/Test2/modules/Hub/Interceptor/Terminator.t b/cpan/Test-Simple/t/Test2/modules/Hub/Interceptor/Terminator.t
index 9f25d4b317..2889aacf4d 100644
--- a/cpan/Test-Simple/t/Test2/modules/Hub/Interceptor/Terminator.t
+++ b/cpan/Test-Simple/t/Test2/modules/Hub/Interceptor/Terminator.t
@@ -1,6 +1,6 @@
 use strict;
 use warnings;
-BEGIN { require "t/tools.pl" };
+use Test2::Tools::Tiny;
 
 use Test2::Hub::Interceptor::Terminator;
 
diff --git a/cpan/Test-Simple/t/Test2/modules/Hub/Subtest.t b/cpan/Test-Simple/t/Test2/modules/Hub/Subtest.t
index ca16785720..b0bf9f029f 100644
--- a/cpan/Test-Simple/t/Test2/modules/Hub/Subtest.t
+++ b/cpan/Test-Simple/t/Test2/modules/Hub/Subtest.t
@@ -1,6 +1,6 @@
 use strict;
 use warnings;
-BEGIN { require "t/tools.pl" };
+use Test2::Tools::Tiny;
 
 use Test2::Hub::Subtest;
 use Test2::Util qw/get_tid/;
diff --git a/cpan/Test-Simple/t/Test2/modules/IPC.t b/cpan/Test-Simple/t/Test2/modules/IPC.t
index 0557925ca4..ddd49c0d9e 100644
--- a/cpan/Test-Simple/t/Test2/modules/IPC.t
+++ b/cpan/Test-Simple/t/Test2/modules/IPC.t
@@ -4,7 +4,7 @@ use warnings;
 use Test2::IPC qw/cull/;
 use Test2::API qw/context test2_ipc_drivers test2_ipc/;
 
-BEGIN { require "t/tools.pl" };
+use Test2::Tools::Tiny;
 
 test2_ipc();
 
diff --git a/cpan/Test-Simple/t/Test2/modules/IPC/Driver.t b/cpan/Test-Simple/t/Test2/modules/IPC/Driver.t
index f7daf84dd7..cbdca09b77 100644
--- a/cpan/Test-Simple/t/Test2/modules/IPC/Driver.t
+++ b/cpan/Test-Simple/t/Test2/modules/IPC/Driver.t
@@ -3,7 +3,7 @@ use warnings;
 
 use Test2::IPC::Driver::Files;
 
-BEGIN { require "t/tools.pl" };
+use Test2::Tools::Tiny;
 use Test2::API qw/context test2_ipc_drivers/;
 
 Test2::IPC::Driver::Files->import();
diff --git a/cpan/Test-Simple/t/Test2/modules/IPC/Driver/Files.t b/cpan/Test-Simple/t/Test2/modules/IPC/Driver/Files.t
index c15f0e7077..0e79101d51 100644
--- a/cpan/Test-Simple/t/Test2/modules/IPC/Driver/Files.t
+++ b/cpan/Test-Simple/t/Test2/modules/IPC/Driver/Files.t
@@ -1,4 +1,4 @@
-BEGIN { require "t/tools.pl" };
+use Test2::Tools::Tiny;
 use Test2::Util qw/get_tid USE_THREADS try ipc_separator/;
 use File::Temp qw/tempfile/;
 use File::Spec qw/catfile/;
diff --git a/cpan/Test-Simple/t/tools.t b/cpan/Test-Simple/t/Test2/modules/Tools/Tiny.t
index a71aff13ae..bdd941db17 100644
--- a/cpan/Test-Simple/t/tools.t
+++ b/cpan/Test-Simple/t/Test2/modules/Tools/Tiny.t
@@ -2,7 +2,7 @@ use strict;
 use warnings;
 
 use Test2::IPC;
-BEGIN { require "t/tools.pl" };
+use Test2::Tools::Tiny;
 
 use Test2::API qw/context intercept test2_stack/;
 
diff --git a/cpan/Test-Simple/t/Test2/modules/Util.t b/cpan/Test-Simple/t/Test2/modules/Util.t
index da44ba1aa2..2bca8e300c 100644
--- a/cpan/Test-Simple/t/Test2/modules/Util.t
+++ b/cpan/Test-Simple/t/Test2/modules/Util.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-BEGIN { require "t/tools.pl" };
+use Test2::Tools::Tiny;
 use Test2::Util qw/
     try
 
diff --git a/cpan/Test-Simple/t/Test2/modules/Util/ExternalMeta.t b/cpan/Test-Simple/t/Test2/modules/Util/ExternalMeta.t
index de6be9963a..bd9812fc37 100644
--- a/cpan/Test-Simple/t/Test2/modules/Util/ExternalMeta.t
+++ b/cpan/Test-Simple/t/Test2/modules/Util/ExternalMeta.t
@@ -1,6 +1,6 @@
 use strict;
 use warnings;
-BEGIN { require "t/tools.pl" };
+use Test2::Tools::Tiny;
 
 {
     package Foo::Bar;
diff --git a/cpan/Test-Simple/t/Test2/modules/Util/Trace.t b/cpan/Test-Simple/t/Test2/modules/Util/Trace.t
index 846c04ff6c..1f87033a4c 100644
--- a/cpan/Test-Simple/t/Test2/modules/Util/Trace.t
+++ b/cpan/Test-Simple/t/Test2/modules/Util/Trace.t
@@ -1,6 +1,6 @@
 use strict;
 use warnings;
-BEGIN { require "t/tools.pl" };
+use Test2::Tools::Tiny;
 use Test2::Util::Trace;
 
 like(
diff --git a/cpan/Test-Simple/t/Test2/regression/693_ipc_ordering.t b/cpan/Test-Simple/t/Test2/regression/693_ipc_ordering.t
index c365b8a777..55116da6ec 100644
--- a/cpan/Test-Simple/t/Test2/regression/693_ipc_ordering.t
+++ b/cpan/Test-Simple/t/Test2/regression/693_ipc_ordering.t
@@ -1,4 +1,4 @@
-BEGIN { require "t/tools.pl" };
+use Test2::Tools::Tiny;
 use strict;
 use warnings;
 
diff --git a/cpan/Test-Simple/t/Test2/regression/ipc_files_abort_exit.t b/cpan/Test-Simple/t/Test2/regression/ipc_files_abort_exit.t
index 1bbc624e31..a2964fd402 100644
--- a/cpan/Test-Simple/t/Test2/regression/ipc_files_abort_exit.t
+++ b/cpan/Test-Simple/t/Test2/regression/ipc_files_abort_exit.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 use Test2::IPC;
-BEGIN { require "t/tools.pl" };
+use Test2::Tools::Tiny;
 use Test2::API qw/context test2_stack/;
 use Test2::Util qw/CAN_FORK/;
 
diff --git a/cpan/Test-Simple/t/regression/696-intercept_skip_all.t b/cpan/Test-Simple/t/regression/696-intercept_skip_all.t
index a9e3463178..1362e1046f 100644
--- a/cpan/Test-Simple/t/regression/696-intercept_skip_all.t
+++ b/cpan/Test-Simple/t/regression/696-intercept_skip_all.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-BEGIN { require "t/tools.pl" };
+use Test2::Tools::Tiny;
 
 use Test2::API qw/intercept/;
 
diff --git a/cpan/Test-Simple/t/regression/721-nested-streamed-subtest.t b/cpan/Test-Simple/t/regression/721-nested-streamed-subtest.t
index d83ed18186..b97e0e6a03 100644
--- a/cpan/Test-Simple/t/regression/721-nested-streamed-subtest.t
+++ b/cpan/Test-Simple/t/regression/721-nested-streamed-subtest.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-BEGIN { require "t/tools.pl" }
+use Test2::Tools::Tiny;
 
 # This module's exports interfere with the ones in t/tools.pl
 use Test::More ();
diff --git a/cpan/Test-Simple/t/regression/no_name_in_subtest.t b/cpan/Test-Simple/t/regression/no_name_in_subtest.t
index d6666fe7e1..e332bb5abd 100644
--- a/cpan/Test-Simple/t/regression/no_name_in_subtest.t
+++ b/cpan/Test-Simple/t/regression/no_name_in_subtest.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-BEGIN { require "t/tools.pl" };
+use Test2::Tools::Tiny;
 
 ok(1, "");