Update to Test-Simple Alpha 068

 * performance enhancements
 * bug fixes
 * comaptability improvements

23 files changed, 190 insertions, 81 deletions

diff --git a/cpan/Test-Simple/lib/Test/Builder.pm b/cpan/Test-Simple/lib/Test/Builder.pm
index 54e392d4fa..5cc66c2a23 100644
--- a/cpan/Test-Simple/lib/Test/Builder.pm
+++ b/cpan/Test-Simple/lib/Test/Builder.pm
@@ -4,7 +4,7 @@ use 5.008001;
 use strict;
 use warnings;
 
-our $VERSION = '1.301001_065';
+our $VERSION = '1.301001_068';
 $VERSION = eval $VERSION;    ## no critic (BuiltinFunctions::ProhibitStringyEval)
 
 use Test::More::Tools;
@@ -13,12 +13,15 @@ use Test::Stream qw/ -internal STATE_LEGACY STATE_PLAN STATE_COUNT /;
 use Test::Stream::Toolset;
 use Test::Stream::Context;
 use Test::Stream::Carp qw/confess/;
+use Test::Stream::Meta qw/MODERN/;
 
 use Test::Stream::Util qw/try protect unoverload_str is_regex/;
 use Scalar::Util qw/blessed reftype/;
 
 BEGIN {
-    Test::Stream->shared->set_use_legacy(1);
+    my $meta = Test::Stream::Meta->is_tester('main');
+    Test::Stream->shared->set_use_legacy(1)
+        unless $meta && $meta->[MODERN];
 }
 
 # The mostly-singleton, and other package vars.
diff --git a/cpan/Test-Simple/lib/Test/Builder/Module.pm b/cpan/Test-Simple/lib/Test/Builder/Module.pm
index d7936da8c8..6705348512 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 0.99;
 require Exporter;
 our @ISA = qw(Exporter);
 
-our $VERSION = '1.301001_065';
+our $VERSION = '1.301001_068';
 $VERSION = eval $VERSION;      ## no critic (BuiltinFunctions::ProhibitStringyEval)
 
 
diff --git a/cpan/Test-Simple/lib/Test/Builder/Tester.pm b/cpan/Test-Simple/lib/Test/Builder/Tester.pm
index ae98639198..df4788f904 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.301001_065';
+our $VERSION = '1.301001_068';
 $VERSION = eval $VERSION;    ## no critic (BuiltinFunctions::ProhibitStringyEval)
 
 use Test::Builder 1.301001;
diff --git a/cpan/Test-Simple/lib/Test/Builder/Tester/Color.pm b/cpan/Test-Simple/lib/Test/Builder/Tester/Color.pm
index c2055518b9..fdbcf2dbf1 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.301001_065';
+our $VERSION = '1.301001_068';
 $VERSION = eval $VERSION;    ## no critic (BuiltinFunctions::ProhibitStringyEval)
 
 require Test::Builder::Tester;
diff --git a/cpan/Test-Simple/lib/Test/More.pm b/cpan/Test-Simple/lib/Test/More.pm
index 5aea2def76..70e8e982f9 100644
--- a/cpan/Test-Simple/lib/Test/More.pm
+++ b/cpan/Test-Simple/lib/Test/More.pm
@@ -4,7 +4,7 @@ use 5.008001;
 use strict;
 use warnings;
 
-our $VERSION = '1.301001_065';
+our $VERSION = '1.301001_068';
 $VERSION = eval $VERSION;    ## no critic (BuiltinFunctions::ProhibitStringyEval)
 
 use Test::Stream::Carp qw/croak carp/;
@@ -16,7 +16,8 @@ use Test::More::DeepCheck::Strict;
 use Test::Stream '-internal';
 use Test::Stream::Util qw/protect try spoof/;
 use Test::Stream::Toolset;
-use Test::Stream::Meta qw/MODERN/;
+
+use Test::Builder;
 
 use Test::Stream::Exporter;
 our $TODO;
@@ -50,10 +51,7 @@ Test::Stream::Exporter->cleanup;
     $Test::Builder::Level ||= 1;
 }
 
-sub builder {
-    protect { require Test::Builder };
-    return Test::Builder->new;
-}
+sub builder { Test::Builder->new }
 
 sub before_import {
     my $class = shift;
@@ -61,8 +59,6 @@ sub before_import {
 
     my $meta = init_tester($importer);
 
-    protect {require Test::Builder} unless $meta->[MODERN];
-
     my $context = context(1);
     my $other   = [];
     my $idx     = 0;
diff --git a/cpan/Test-Simple/lib/Test/Simple.pm b/cpan/Test-Simple/lib/Test/Simple.pm
index 59c7a28c4e..b26ffd7ce4 100644
--- a/cpan/Test-Simple/lib/Test/Simple.pm
+++ b/cpan/Test-Simple/lib/Test/Simple.pm
@@ -5,7 +5,7 @@ use 5.008001;
 use strict;
 use warnings;
 
-our $VERSION = '1.301001_065';
+our $VERSION = '1.301001_068';
 $VERSION = eval $VERSION;    ## no critic (BuiltinFunctions::ProhibitStringyEval)
 
 use Test::Stream '-internal';
diff --git a/cpan/Test-Simple/lib/Test/Stream.pm b/cpan/Test-Simple/lib/Test/Stream.pm
index ac9eaf3ce7..fb616f0a60 100644
--- a/cpan/Test-Simple/lib/Test/Stream.pm
+++ b/cpan/Test-Simple/lib/Test/Stream.pm
@@ -2,7 +2,7 @@ package Test::Stream;
 use strict;
 use warnings;
 
-our $VERSION = '1.301001_065';
+our $VERSION = '1.301001_068';
 $VERSION = eval $VERSION;    ## no critic (BuiltinFunctions::ProhibitStringyEval)
 
 use Test::Stream::Threads;
@@ -10,14 +10,13 @@ use Test::Stream::IOSets;
 use Test::Stream::Util qw/try/;
 use Test::Stream::Carp qw/croak confess carp/;
 use Test::Stream::Meta qw/MODERN ENCODING init_tester/;
-use Encode();
 
 use Test::Stream::ArrayBase(
     accessors => [qw{
         no_ending no_diag no_header
         pid tid
         state
-        subtests subtest_todo
+        subtests subtest_todo subtest_exception
         subtest_tap_instant
         subtest_tap_delayed
         mungers
@@ -33,28 +32,30 @@ use Test::Stream::ArrayBase(
     }],
 );
 
-use constant STATE_COUNT   => 0;
-use constant STATE_FAILED  => 1;
-use constant STATE_PLAN    => 2;
-use constant STATE_PASSING => 3;
-use constant STATE_LEGACY  => 4;
-use constant STATE_ENDED   => 5;
+sub STATE_COUNT()   { 0 }
+sub STATE_FAILED()  { 1 }
+sub STATE_PLAN()    { 2 }
+sub STATE_PASSING() { 3 }
+sub STATE_LEGACY()  { 4 }
+sub STATE_ENDED()   { 5 }
 
-use constant OUT_STD  => 0;
-use constant OUT_ERR  => 1;
-use constant OUT_TODO => 2;
+sub OUT_STD()  { 0 }
+sub OUT_ERR()  { 1 }
+sub OUT_TODO() { 2 }
 
 use Test::Stream::Exporter;
 exports qw/
     OUT_STD OUT_ERR OUT_TODO
     STATE_COUNT STATE_FAILED STATE_PLAN STATE_PASSING STATE_LEGACY STATE_ENDED
 /;
-
 default_exports qw/ cull tap_encoding /;
+Test::Stream::Exporter->cleanup;
 
 sub tap_encoding {
     my ($encoding) = @_;
 
+    require Encode;
+
     croak "encoding '$encoding' is not valid, or not available"
         unless $encoding eq 'legacy' || Encode::find_encoding($encoding);
 
@@ -72,7 +73,6 @@ sub cull {
     $ctx->stream->fork_cull();
 }
 
-Test::Stream::Exporter->cleanup;
 sub before_import {
     my $class = shift;
     my ($importer, $list) = @_;
@@ -89,8 +89,6 @@ sub before_import {
     my $idx    = 0;
     my $stream = $class->shared;
 
-    $stream->use_fork;
-
     while ($idx <= $#{$list}) {
         my $item = $list->[$idx++];
         next unless $item;
@@ -130,6 +128,9 @@ sub before_import {
             $stream->io_sets->init_encoding($encoding);
             $meta->[ENCODING] = $encoding;
         }
+        elsif ($item eq 'enable_fork') {
+            $stream->use_fork;
+        }
         else {
             push @$other => $item;
         }
@@ -431,6 +432,7 @@ sub send {
             push @{$self->[STATE]} => [0, 0, undef, 1];
             push @{$self->[SUBTESTS]} => [];
             push @{$self->[SUBTEST_TODO]} => $e->context->in_todo;
+            push @{$self->[SUBTEST_EXCEPTION]} => undef;
 
             return $e;
         }
@@ -441,11 +443,12 @@ sub send {
             confess "Child pop left the stream without a state!" unless @{$self->[STATE]};
 
             $e = Test::Stream::Event::Subtest->new_from_pairs(
-                context => $e->context,
-                created => $e->created,
-                events  => $events,
-                state   => $state,
-                name    => $e->name,
+                context   => $e->context,
+                created   => $e->created,
+                events    => $events,
+                state     => $state,
+                name      => $e->name,
+                exception => pop @{$self->[SUBTEST_EXCEPTION]},
             );
         }
     }
@@ -581,12 +584,18 @@ sub _finalize_event {
         $cache->{state}->[STATE_PLAN] = $e;
         return unless $e->directive;
         return unless $e->directive eq 'SKIP';
+
+        $self->[SUBTEST_EXCEPTION]->[-1] = $e if $e->in_subtest;
+
         die $e if $e->in_subtest || !$self->[EXIT_ON_DISRUPTION];
         exit 0;
     }
     elsif (!$cache->{do_tap} && $e->isa('Test::Stream::Event::Bail')) {
         $self->[BAILED_OUT] = $e;
         $self->[NO_ENDING]  = 1;
+
+        $self->[SUBTEST_EXCEPTION]->[-1] = $e if $e->in_subtest;
+
         die $e if $e->in_subtest || !$self->[EXIT_ON_DISRUPTION];
         exit 255;
     }
@@ -680,10 +689,9 @@ Test::Stream - A modern infrastructure for testing.
 
 =head1 FEATURES
 
-When you load Test::Stream inside your test file you activate forking support,
-and prevent Test::More from turning on some expensive legacy support. You will
-also get warnings if your code, or any other code you load uses deprecated or
-discouraged practices.
+When you load Test::Stream inside your test file you prevent Test::More from
+turning on some expensive legacy support. You will also get warnings if your
+code, or any other code you load uses deprecated or discouraged practices.
 
 =head1 IMPORT ARGUMENTS
 
@@ -715,6 +723,12 @@ Show events within subtest AFTER the subtest event itself is complete.
 
 Show events as they happen, then also display them after.
 
+=item 'enable_fork'
+
+Turns on support for code that forks. This is nto activated by default because
+it adds ~30ms to the Test::More compile-time, which can really add up in large
+test suites. Turn it on only when needed.
+
 =item 'utf8'
 
 Set the TAP encoding to utf8
diff --git a/cpan/Test-Simple/lib/Test/Stream/ArrayBase.pm b/cpan/Test-Simple/lib/Test/Stream/ArrayBase.pm
index 967a070d9a..1be55694f0 100644
--- a/cpan/Test-Simple/lib/Test/Stream/ArrayBase.pm
+++ b/cpan/Test-Simple/lib/Test/Stream/ArrayBase.pm
@@ -52,11 +52,8 @@ sub apply_to {
         $ab_meta->baseclass();
     }
 
-    if ($args{accessors}) {
-        $ab_meta->add_accessor($_) for @{$args{accessors}};
-    }
-
-    1;
+    $ab_meta->add_accessors(@{$args{accessors}})
+        if $args{accessors};
 }
 
 sub new {
diff --git a/cpan/Test-Simple/lib/Test/Stream/ArrayBase/Meta.pm b/cpan/Test-Simple/lib/Test/Stream/ArrayBase/Meta.pm
index 0a1eca5369..a283afd550 100644
--- a/cpan/Test-Simple/lib/Test/Stream/ArrayBase/Meta.pm
+++ b/cpan/Test-Simple/lib/Test/Stream/ArrayBase/Meta.pm
@@ -60,36 +60,61 @@ sub subclass {
     }
 }
 
-sub add_accessor {
+my $IDX = -1;
+my (@CONST, @GET, @SET);
+_GROW(20);
+
+sub _GROW {
+    my ($max) = @_;
+    return if $max <= $IDX;
+    for (($IDX + 1) .. $max) {
+        # Var per sub for inlining/constant stuff.
+        my $c  = $_;
+        my $gi = $_;
+        my $si = $_;
+
+        $CONST[$_] = sub() { $c };
+        $GET[$_]   = sub   { $_[0]->[$gi] };
+        $SET[$_]   = sub { $_[0]->[$si] = $_[1] };
+    }
+    $IDX = $max;
+}
+
+*add_accessor = \&add_accessors;
+sub add_accessors {
     my $self = shift;
-    my ($name) = @_;
 
     confess "Cannot add accessor, metadata is locked due to a subclass being initialized ($self->{parent}).\n"
         if $self->{locked};
 
-    confess "field '$name' already defined!"
-        if exists $self->{fields}->{$name};
+    my $ex_meta = Test::Stream::Exporter::Meta->get($self->{package});
 
-    my $idx = $self->{index}++;
-    $self->{fields}->{$name} = $idx;
+    for my $name (@_) {
+        confess "field '$name' already defined!"
+            if exists $self->{fields}->{$name};
 
-    my $const = uc $name;
-    my $gname = lc $name;
-    my $sname = "set_$gname";
+        my $idx = $self->{index}++;
+        $self->{fields}->{$name} = $idx;
 
-    eval qq|
-        package $self->{package};
-        sub $gname { \$_[0]->[$idx] }
-        sub $sname { \$_[0]->[$idx] = \$_[1] }
-        sub $const() { $idx }
-        1
-    | || confess $@;
+        _GROW($IDX + 10) if $idx > $IDX;
 
-    # Add the constant as an optional export
-    my $ex_meta = Test::Stream::Exporter::Meta->get($self->{package});
-    $ex_meta->add($const);
+        my $const = uc $name;
+        my $gname = lc $name;
+        my $sname = "set_$gname";
+
+        {
+            no strict 'refs';
+            *{"$self->{package}\::$const"} = $CONST[$idx];
+            *{"$self->{package}\::$gname"} = $GET[$idx];
+            *{"$self->{package}\::$sname"} = $SET[$idx];
+        }
+
+        $ex_meta->{exports}->{$const} = $CONST[$idx];
+        push @{$ex_meta->{polist}} => $const;
+    }
 }
 
+
 1;
 
 __END__
diff --git a/cpan/Test-Simple/lib/Test/Stream/Event/Subtest.pm b/cpan/Test-Simple/lib/Test/Stream/Event/Subtest.pm
index 57d1cbf1a5..ec54743ddf 100644
--- a/cpan/Test-Simple/lib/Test/Stream/Event/Subtest.pm
+++ b/cpan/Test-Simple/lib/Test/Stream/Event/Subtest.pm
@@ -17,7 +17,7 @@ sub init {
     $self->[REAL_BOOL] = $self->[STATE]->[STATE_PASSING] && $self->[STATE]->[STATE_COUNT];
     $self->[EVENTS] ||= [];
 
-    if (my $le = $self->[EVENTS]->[-1]) {
+    if (my $le = $self->[EXCEPTION]) {
         my $is_skip = $le->isa('Test::Stream::Event::Plan');
         $is_skip &&= $le->directive;
         $is_skip &&= $le->directive eq 'SKIP';
@@ -28,8 +28,6 @@ sub init {
             $self->[CONTEXT]->set_skip($skip);
             $self->[REAL_BOOL] = 1;
         }
-
-        $self->[EXCEPTION] = $le if $is_skip || $le->isa('Test::Stream::Event::Bail');
     }
 
     push @{$self->[DIAG]} => '  No tests run for subtest.'
diff --git a/cpan/Test-Simple/lib/Test/Stream/Exporter.pm b/cpan/Test-Simple/lib/Test/Stream/Exporter.pm
index 0f70a551d3..9de74e90b1 100644
--- a/cpan/Test-Simple/lib/Test/Stream/Exporter.pm
+++ b/cpan/Test-Simple/lib/Test/Stream/Exporter.pm
@@ -47,13 +47,14 @@ sub export_to {
     my $class = shift;
     my ($dest, @imports) = @_;
 
-    my $meta = export_meta($class)
+    my $meta = Test::Stream::Exporter::Meta->get($class)
         || confess "$class is not an exporter!?";
 
     my (@include, %exclude);
     for my $import (@imports) {
-        if ($import =~ m/^!(.*)$/) {
-            $exclude{$1}++;
+        if (substr($import, 0, 1) eq '!') {
+            $import =~ s/^!//g;
+            $exclude{$import}++;
         }
         else {
             push @include => $import;
@@ -62,10 +63,11 @@ sub export_to {
 
     @include = $meta->default unless @include;
 
+    my $exports = $meta->exports;
     for my $name (@include) {
         next if $exclude{$name};
 
-        my $ref = $meta->exports->{$name}
+        my $ref = $exports->{$name}
             || croak "$class does not export $name";
 
         no strict 'refs';
@@ -95,7 +97,7 @@ sub exports {
     my $meta = export_meta($caller) ||
         confess "$caller is not an exporter!?";
 
-    $meta->add($_) for @_;
+    $meta->add_bulk(@_);
 }
 
 sub default_export {
@@ -114,7 +116,7 @@ sub default_exports {
     my $meta = export_meta($caller) ||
         confess "$caller is not an exporter!?";
 
-    $meta->add_default($_) for @_;
+    $meta->add_default_bulk(@_);
 }
 
 1;
diff --git a/cpan/Test-Simple/lib/Test/Stream/Exporter/Meta.pm b/cpan/Test-Simple/lib/Test/Stream/Exporter/Meta.pm
index fc055beda7..e3de004448 100644
--- a/cpan/Test-Simple/lib/Test/Stream/Exporter/Meta.pm
+++ b/cpan/Test-Simple/lib/Test/Stream/Exporter/Meta.pm
@@ -40,6 +40,39 @@ sub add_default {
     $self->{default}->{$name} = 1;
 }
 
+sub add_bulk {
+    my $self = shift;
+    for my $name (@_) {
+        confess "$name is already exported"
+            if $self->exports->{$name};
+
+        my $ref = package_sym($self->{package}, CODE => $name)
+            || confess "No reference or package sub found for '$name' in '$self->{package}'";
+
+        $self->{exports}->{$name} = $ref;
+    }
+
+    push @{$self->{polist}} => @_;
+}
+
+sub add_default_bulk {
+    my $self = shift;
+
+    for my $name (@_) {
+        confess "$name is already exported"
+            if $self->exports->{$name};
+
+        my $ref = package_sym($self->{package}, CODE => $name)
+            || confess "No reference or package sub found for '$name' in '$self->{package}'";
+
+        $self->{exports}->{$name} = $ref;
+        $self->{default}->{$name} = 1;
+    }
+
+    push @{$self->{polist}} => @_;
+    push @{$self->{pdlist}} => @_;
+}
+
 my %EXPORT_META;
 
 sub new {
diff --git a/cpan/Test-Simple/lib/Test/Tester.pm b/cpan/Test-Simple/lib/Test/Tester.pm
index 62a9001b9c..6f0edad410 100644
--- a/cpan/Test-Simple/lib/Test/Tester.pm
+++ b/cpan/Test-Simple/lib/Test/Tester.pm
@@ -15,7 +15,7 @@ require Exporter;
 
 use vars qw( @ISA @EXPORT $VERSION );
 
-our $VERSION = '1.301001_065';
+our $VERSION = '1.301001_068';
 $VERSION = eval $VERSION;    ## no critic (BuiltinFunctions::ProhibitStringyEval)
 
 @EXPORT  = qw( run_tests check_tests check_test cmp_results show_space );
diff --git a/cpan/Test-Simple/lib/Test/use/ok.pm b/cpan/Test-Simple/lib/Test/use/ok.pm
index 26417bb1e0..a5b4aab0d7 100644
--- a/cpan/Test-Simple/lib/Test/use/ok.pm
+++ b/cpan/Test-Simple/lib/Test/use/ok.pm
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 use 5.005;
 
-our $VERSION = '1.301001_065';
+our $VERSION = '1.301001_068';
 $VERSION = eval $VERSION;    ## no critic (BuiltinFunctions::ProhibitStringyEval)
 
 1;
diff --git a/cpan/Test-Simple/lib/ok.pm b/cpan/Test-Simple/lib/ok.pm
index a8c8dc40f7..927b006330 100644
--- a/cpan/Test-Simple/lib/ok.pm
+++ b/cpan/Test-Simple/lib/ok.pm
@@ -5,7 +5,7 @@ use warnings;
 use Test::More 1.301001 ();
 use Test::Stream::Carp qw/croak/;
 
-our $VERSION = '1.301001_065';
+our $VERSION = '1.301001_068';
 $VERSION = eval $VERSION;    ## no critic (BuiltinFunctions::ProhibitStringyEval)
 
 sub import {
diff --git a/cpan/Test-Simple/t/Behavior/skip_all_in_subtest.load b/cpan/Test-Simple/t/Behavior/skip_all_in_subtest.load
new file mode 100644
index 0000000000..241ce14963
--- /dev/null
+++ b/cpan/Test-Simple/t/Behavior/skip_all_in_subtest.load
@@ -0,0 +1,10 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+
+use Carp qw/confess/;
+
+use Test::More skip_all => "Cause I feel like it";
+
+confess "Should not see this!";
diff --git a/cpan/Test-Simple/t/Behavior/skip_all_in_subtest.t b/cpan/Test-Simple/t/Behavior/skip_all_in_subtest.t
new file mode 100644
index 0000000000..c66901a5a8
--- /dev/null
+++ b/cpan/Test-Simple/t/Behavior/skip_all_in_subtest.t
@@ -0,0 +1,16 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+
+use Test::More;
+
+subtest my_subtest => sub {
+    my $file = __FILE__;
+    $file =~ s/\.t$/.load/;
+    do $file;
+    note "Got: $@";
+    fail($@);
+};
+
+done_testing;
diff --git a/cpan/Test-Simple/t/Legacy/Builder/fork_with_new_stdout.t b/cpan/Test-Simple/t/Legacy/Builder/fork_with_new_stdout.t
index bcd7156e89..5e20d8126e 100644
--- a/cpan/Test-Simple/t/Legacy/Builder/fork_with_new_stdout.t
+++ b/cpan/Test-Simple/t/Legacy/Builder/fork_with_new_stdout.t
@@ -16,6 +16,9 @@ my $Can_Fork = $Config{d_fork}
 if (!$Can_Fork) {
     $b->plan('skip_all' => "This system cannot fork");
 }
+elsif ($^O eq 'MSWin32' && $] == 5.010000) {
+    $b->plan('skip_all' => "5.10 has fork/threading issues that break fork on win32");
+}
 else {
     $b->plan('tests' => 2);
 }
diff --git a/cpan/Test-Simple/t/Legacy/fork.t b/cpan/Test-Simple/t/Legacy/fork.t
index fd895b450f..ad02824f52 100644
--- a/cpan/Test-Simple/t/Legacy/fork.t
+++ b/cpan/Test-Simple/t/Legacy/fork.t
@@ -19,6 +19,9 @@ my $Can_Fork = $Config{d_fork} ||
 if( !$Can_Fork ) {
     plan skip_all => "This system cannot fork";
 }
+elsif ($^O eq 'MSWin32' && $] == 5.010000) {
+    plan 'skip_all' => "5.10 has fork/threading issues that break fork on win32";
+}
 else {
     plan tests => 1;
 }
diff --git a/cpan/Test-Simple/t/Legacy/fork_in_subtest.t b/cpan/Test-Simple/t/Legacy/fork_in_subtest.t
index 3ed851a638..b89cc5c19a 100644
--- a/cpan/Test-Simple/t/Legacy/fork_in_subtest.t
+++ b/cpan/Test-Simple/t/Legacy/fork_in_subtest.t
@@ -10,14 +10,19 @@ BEGIN {
                     $Config{ccflags} =~ /-DPERL_IMPLICIT_SYS/
                    );
 
-    unless( $Can_Fork ) {
+    if( !$Can_Fork ) {
         require Test::More;
         Test::More::plan(skip_all => "This system cannot fork");
         exit 0;
     }
+    elsif ($^O eq 'MSWin32' && $] == 5.010000) {
+        require Test::More;
+        Test::More::plan('skip_all' => "5.10 has fork/threading issues that break fork on win32");
+        exit 0;
+    }
 }
 
-use Test::Stream;
+use Test::Stream 'enable_fork';
 use Test::More;
 # This just goes to show how silly forking inside a subtest would actually
 # be....
diff --git a/cpan/Test-Simple/t/Legacy/skip.t b/cpan/Test-Simple/t/Legacy/skip.t
index 6a0612ab41..18d5541295 100644
--- a/cpan/Test-Simple/t/Legacy/skip.t
+++ b/cpan/Test-Simple/t/Legacy/skip.t
@@ -7,15 +7,16 @@ BEGIN {
     }
 }
 
-use Test::More tests => 16;
-
 BEGIN {
     require warnings;
     if( eval "warnings->can('carp')" ) {
-        plan skip_all => 'Modern::Open is installed, which breaks this test';
+        require Test::More;
+        Test::More::plan( skip_all => 'Modern::Open is installed, which breaks this test' );
     }
 }
 
+use Test::More tests => 16;
+
 # If we skip with the same name, Test::Harness will report it back and
 # we won't get lots of false bug reports.
 my $Why = "Just testing the skip interface.";
diff --git a/cpan/Test-Simple/t/Legacy/subtest/fork.t b/cpan/Test-Simple/t/Legacy/subtest/fork.t
index 0191e7894b..76e949329b 100644
--- a/cpan/Test-Simple/t/Legacy/subtest/fork.t
+++ b/cpan/Test-Simple/t/Legacy/subtest/fork.t
@@ -15,6 +15,9 @@ my $Can_Fork = $Config{d_fork} ||
 if( !$Can_Fork ) {
     plan 'skip_all' => "This system cannot fork";
 }
+elsif ($^O eq 'MSWin32' && $] == 5.010000) {
+    plan 'skip_all' => "5.10 has fork/threading issues that break fork on win32";
+}
 else {
     plan 'tests' => 1;
 }
diff --git a/cpan/Test-Simple/t/Test-Stream-Carp.t b/cpan/Test-Simple/t/Test-Stream-Carp.t
index e599cb428a..037d23f48b 100644
--- a/cpan/Test-Simple/t/Test-Stream-Carp.t
+++ b/cpan/Test-Simple/t/Test-Stream-Carp.t
@@ -5,7 +5,7 @@ use warnings;
 BEGIN {
     require Test::Stream::Threads;
     if ($INC{'Carp.pm'}) {
-        print "1..0 # Carp is already loaded before we even begin.\n";
+        print "1..0 # SKIP: Carp is already loaded before we even begin.\n";
         exit 0;
     }
 }