Fixed up Test-Harness tests to work under core. There are still three outstanding will ask AndyA to investigate

34 files changed, 607 insertions, 290 deletions

diff --git a/cpan/Test-Harness/MANIFEST b/cpan/Test-Harness/MANIFEST
new file mode 100644
index 0000000000..b3aa2f8b90
--- /dev/null
+++ b/cpan/Test-Harness/MANIFEST
@@ -0,0 +1,231 @@
+bin/prove
+Build.PL
+Changes
+Changes-2.64
+examples/analyze_tests.pl
+examples/bin/forked_tests.pl
+examples/bin/test_html.pl
+examples/bin/tprove_gtk
+examples/harness-hook/hook.pl
+examples/harness-hook/lib/Harness/Hook.pm
+examples/my_exec
+examples/README
+examples/silent-harness.pl
+examples/t/10-stuff.t
+examples/t/ruby.t
+examples/test_urls.txt
+HACKING.pod
+inc/MyBuilder.pm
+lib/App/Prove.pm
+lib/App/Prove/State.pm
+lib/App/Prove/State/Result.pm
+lib/App/Prove/State/Result/Test.pm
+lib/TAP/Base.pm
+lib/TAP/Formatter/Base.pm
+lib/TAP/Formatter/Color.pm
+lib/TAP/Formatter/Console.pm
+lib/TAP/Formatter/Console/ParallelSession.pm
+lib/TAP/Formatter/Console/Session.pm
+lib/TAP/Formatter/File.pm
+lib/TAP/Formatter/File/Session.pm
+lib/TAP/Formatter/Session.pm
+lib/TAP/Harness.pm
+lib/TAP/Harness/Beyond.pod
+lib/TAP/Object.pm
+lib/TAP/Parser.pm
+lib/TAP/Parser/Aggregator.pm
+lib/TAP/Parser/Grammar.pm
+lib/TAP/Parser/Iterator.pm
+lib/TAP/Parser/Iterator/Array.pm
+lib/TAP/Parser/Iterator/Process.pm
+lib/TAP/Parser/Iterator/Stream.pm
+lib/TAP/Parser/IteratorFactory.pm
+lib/TAP/Parser/Multiplexer.pm
+lib/TAP/Parser/Result.pm
+lib/TAP/Parser/Result/Bailout.pm
+lib/TAP/Parser/Result/Comment.pm
+lib/TAP/Parser/Result/Plan.pm
+lib/TAP/Parser/Result/Pragma.pm
+lib/TAP/Parser/Result/Test.pm
+lib/TAP/Parser/Result/Unknown.pm
+lib/TAP/Parser/Result/Version.pm
+lib/TAP/Parser/Result/YAML.pm
+lib/TAP/Parser/ResultFactory.pm
+lib/TAP/Parser/Scheduler.pm
+lib/TAP/Parser/Scheduler/Job.pm
+lib/TAP/Parser/Scheduler/Spinner.pm
+lib/TAP/Parser/Source.pm
+lib/TAP/Parser/SourceHandler.pm
+lib/TAP/Parser/SourceHandler/Executable.pm
+lib/TAP/Parser/SourceHandler/File.pm
+lib/TAP/Parser/SourceHandler/Handle.pm
+lib/TAP/Parser/SourceHandler/Perl.pm
+lib/TAP/Parser/SourceHandler/pgTAP.pm
+lib/TAP/Parser/SourceHandler/RawTAP.pm
+lib/TAP/Parser/Utils.pm
+lib/TAP/Parser/YAMLish/Reader.pm
+lib/TAP/Parser/YAMLish/Writer.pm
+lib/Test/Harness.pm
+MANIFEST
+MANIFEST.CUMMULATIVE
+META.yml
+perlcriticrc
+README
+t/000-load.t
+t/aggregator.t
+t/bailout.t
+t/base.t
+t/callbacks.t
+t/compat/env.t
+t/compat/failure.t
+t/compat/inc-propagation.t
+t/compat/inc_taint.t
+t/compat/nonumbers.t
+t/compat/regression.t
+t/compat/subclass.t
+t/compat/switches.t
+t/compat/test-harness-compat.t
+t/compat/version.t
+t/console.t
+t/data/catme.1
+t/data/proverc
+t/data/sample.yml
+t/errors.t
+t/file.t
+t/glob-to-regexp.t
+t/grammar.t
+t/harness-bailout.t
+t/harness-subclass.t
+t/harness.t
+t/iterator_factory.t
+t/iterators.t
+t/lib/App/Prove/Plugin/Dummy.pm
+t/lib/App/Prove/Plugin/Dummy2.pm
+t/lib/Dev/Null.pm
+t/lib/EmptyParser.pm
+t/lib/if.pm
+t/lib/IO/c55Capture.pm
+t/lib/MyCustom.pm
+t/lib/MyFileSourceHandler.pm
+t/lib/MyGrammar.pm
+t/lib/MyIterator.pm
+t/lib/MyPerlSourceHandler.pm
+t/lib/MyResult.pm
+t/lib/MyResultFactory.pm
+t/lib/MyShebangger.pm
+t/lib/MySourceHandler.pm
+t/lib/NoFork.pm
+t/lib/NOP.pm
+t/lib/TAP/Harness/TestSubclass.pm
+t/lib/TAP/Parser/SubclassTest.pm
+t/lib/Test/Builder.pm
+t/lib/Test/Builder/Module.pm
+t/lib/Test/More.pm
+t/lib/Test/Simple.pm
+t/multiplexer.t
+t/nofork-mux.t
+t/nofork.t
+t/object.t
+t/parse.t
+t/parser-config.t
+t/parser-subclass.t
+t/perl5lib.t
+t/premature-bailout.t
+t/process.t
+t/prove.t
+t/proveenv.t
+t/proverc.t
+t/proverc/emptyexec
+t/proverun.t
+t/regression.t
+t/results.t
+t/sample-tests/bailout
+t/sample-tests/bignum
+t/sample-tests/bignum_many
+t/sample-tests/combined
+t/sample-tests/combined_compat
+t/sample-tests/delayed
+t/sample-tests/descriptive
+t/sample-tests/descriptive_trailing
+t/sample-tests/die
+t/sample-tests/die_head_end
+t/sample-tests/die_last_minute
+t/sample-tests/die_unfinished
+t/sample-tests/duplicates
+t/sample-tests/echo
+t/sample-tests/empty
+t/sample-tests/escape_eol
+t/sample-tests/escape_hash
+t/sample-tests/head_end
+t/sample-tests/head_fail
+t/sample-tests/inc_taint
+t/sample-tests/junk_before_plan
+t/sample-tests/lone_not_bug
+t/sample-tests/no_nums
+t/sample-tests/no_output
+t/sample-tests/out_err_mix
+t/sample-tests/out_of_order
+t/sample-tests/schwern
+t/sample-tests/schwern-todo-quiet
+t/sample-tests/segfault
+t/sample-tests/sequence_misparse
+t/sample-tests/shbang_misparse
+t/sample-tests/simple
+t/sample-tests/simple_fail
+t/sample-tests/simple_yaml
+t/sample-tests/skip
+t/sample-tests/skip_nomsg
+t/sample-tests/skipall
+t/sample-tests/skipall_nomsg
+t/sample-tests/skipall_v13
+t/sample-tests/space_after_plan
+t/sample-tests/stdout_stderr
+t/sample-tests/strict
+t/sample-tests/switches
+t/sample-tests/taint
+t/sample-tests/taint_warn
+t/sample-tests/todo
+t/sample-tests/todo_inline
+t/sample-tests/todo_misparse
+t/sample-tests/too_many
+t/sample-tests/version_good
+t/sample-tests/version_late
+t/sample-tests/version_old
+t/sample-tests/vms_nit
+t/sample-tests/with_comments
+t/sample-tests/zero_valid
+t/scheduler.t
+t/source.t
+t/source_handler.t
+t/source_tests/harness
+t/source_tests/harness_badtap
+t/source_tests/harness_complain
+t/source_tests/harness_directives
+t/source_tests/harness_failure
+t/source_tests/psql
+t/source_tests/psql.bat
+t/source_tests/source
+t/source_tests/source.1
+t/source_tests/source.bat
+t/source_tests/source.pl
+t/source_tests/source.sh
+t/source_tests/source.t
+t/source_tests/source.tap
+t/spool.t
+t/state.t
+t/state_results.t
+t/streams.t
+t/subclass_tests/non_perl_source
+t/subclass_tests/perl_source
+t/taint.t
+t/testargs.t
+t/unicode.t
+t/utils.t
+t/yamlish-output.t
+t/yamlish-writer.t
+t/yamlish.t
+xt/author/pod-coverage.t
+xt/author/pod.t
+xt/author/stdin.t
+xt/perls/harness_perl.t
+xt/perls/sample-tests/perl_version
diff --git a/cpan/Test-Harness/MANIFEST.CUMMULATIVE b/cpan/Test-Harness/MANIFEST.CUMMULATIVE
new file mode 100644
index 0000000000..bce47c42fc
--- /dev/null
+++ b/cpan/Test-Harness/MANIFEST.CUMMULATIVE
@@ -0,0 +1,329 @@
+.perltidyrc
+Build.PL
+Changes
+Changes-2.64
+HACKING.pod
+MANIFEST
+MANIFEST.CUMMULATIVE
+META.yml
+Makefile.PL
+README
+TODO
+bin/prove
+bin/runtests
+examples/README
+examples/analyze_tests.pl
+examples/bin/forked_tests.pl
+examples/bin/test_html.pl
+examples/bin/tprove
+examples/bin/tprove_color
+examples/bin/tprove_gtk
+examples/harness-hook/hook.pl
+examples/harness-hook/lib/Harness/Hook.pm
+examples/my_exec
+examples/my_execrc
+examples/silent-harness.pl
+examples/t/10-stuff.t
+examples/t/ruby.t
+examples/tapx_harness_execrc
+examples/test_urls.txt
+inc/MyBuilder.pm
+lib/App/Prove.pm
+lib/App/Prove/State.pm
+lib/App/Prove/State/Result.pm
+lib/App/Prove/State/Result/Test.pm
+lib/TAP/Base.pm
+lib/TAP/Formatter/Base.pm
+lib/TAP/Formatter/Color.pm
+lib/TAP/Formatter/Console.pm
+lib/TAP/Formatter/Console/ParallelSession.pm
+lib/TAP/Formatter/Console/Session.pm
+lib/TAP/Formatter/File.pm
+lib/TAP/Formatter/File/Session.pm
+lib/TAP/Formatter/Session.pm
+lib/TAP/Harness.pm
+lib/TAP/Harness/Beyond.pod
+lib/TAP/Harness/Color.pm
+lib/TAP/Harness/Compatible.pm
+lib/TAP/Object.pm
+lib/TAP/Parser.pm
+lib/TAP/Parser/Aggregator.pm
+lib/TAP/Parser/Grammar.pm
+lib/TAP/Parser/Iterator.pm
+lib/TAP/Parser/Iterator/Array.pm
+lib/TAP/Parser/Iterator/Process.pm
+lib/TAP/Parser/Iterator/Stream.pm
+lib/TAP/Parser/IteratorFactory.pm
+lib/TAP/Parser/Multiplexer.pm
+lib/TAP/Parser/Result.pm
+lib/TAP/Parser/Result/Bailout.pm
+lib/TAP/Parser/Result/Comment.pm
+lib/TAP/Parser/Result/Plan.pm
+lib/TAP/Parser/Result/Pragma.pm
+lib/TAP/Parser/Result/Test.pm
+lib/TAP/Parser/Result/Unknown.pm
+lib/TAP/Parser/Result/Version.pm
+lib/TAP/Parser/Result/YAML.pm
+lib/TAP/Parser/ResultFactory.pm
+lib/TAP/Parser/Scheduler.pm
+lib/TAP/Parser/Scheduler/Job.pm
+lib/TAP/Parser/Scheduler/Spinner.pm
+lib/TAP/Parser/Source.pm
+lib/TAP/Parser/Source/Perl.pm
+lib/TAP/Parser/SourceHandler.pm
+lib/TAP/Parser/SourceHandler/Executable.pm
+lib/TAP/Parser/SourceHandler/File.pm
+lib/TAP/Parser/SourceHandler/Handle.pm
+lib/TAP/Parser/SourceHandler/Perl.pm
+lib/TAP/Parser/SourceHandler/RawTAP.pm
+lib/TAP/Parser/SourceHandler/pgTAP.pm
+lib/TAP/Parser/Utils.pm
+lib/TAP/Parser/YAML.pm
+lib/TAP/Parser/YAMLish/Reader.pm
+lib/TAP/Parser/YAMLish/Writer.pm
+lib/TAPx/Base.pm
+lib/TAPx/Harness.pm
+lib/TAPx/Harness/Color.pm
+lib/TAPx/Harness/Compatible.pm
+lib/TAPx/Harness/Compatible/Iterator.pm
+lib/TAPx/Harness/Compatible/Point.pm
+lib/TAPx/Harness/Compatible/Results.pm
+lib/TAPx/Harness/Compatible/Straps.pm
+lib/TAPx/Harness/Compatible/TAP.pod
+lib/TAPx/Harness/Compatible/Util.pm
+lib/TAPx/Parser.pm
+lib/TAPx/Parser/Aggregator.pm
+lib/TAPx/Parser/Grammar.pm
+lib/TAPx/Parser/Iterator.pm
+lib/TAPx/Parser/Result.pm
+lib/TAPx/Parser/Result/Bailout.pm
+lib/TAPx/Parser/Result/Comment.pm
+lib/TAPx/Parser/Result/Plan.pm
+lib/TAPx/Parser/Result/Test.pm
+lib/TAPx/Parser/Result/Unknown.pm
+lib/TAPx/Parser/Source.pm
+lib/TAPx/Parser/Source/Perl.pm
+lib/TAPx/Parser/YAML.pm
+lib/Test/Harness.pm
+patches/ExtUtils-MakeMaker-6.31.patch
+perlcriticrc
+perltidyrc
+t/000-load.t
+t/010-base.t
+t/010-regression.t
+t/020-parse.t
+t/020-regression.t
+t/030-bailout.t
+t/030-grammar.t
+t/040-errors.t
+t/040-parse.t
+t/050-bailout.t
+t/050-streams.t
+t/060-aggregator.t
+t/060-errors.t
+t/070-callbacks.t
+t/070-streams.t
+t/080-aggregator.t
+t/080-premature-bailout.t
+t/090-callbacks.t
+t/090-iterators.t
+t/100-harness.t
+t/100-premature-bailout.t
+t/110-iterators.t
+t/110-source.t
+t/120-harness.t
+t/130-source.t
+t/140-results.t
+t/140-varsource.t
+t/150-results.t
+t/150-yamlish.t
+t/160-yaml.t
+t/160-yamlish-writer.t
+t/170-yamlish-output.t
+t/180-unicode.t
+t/190-nofork.t
+t/200-prove.t
+t/aggregator.t
+t/bailout.t
+t/base.t
+t/callbacks.t
+t/compat/000-compile.t
+t/compat/00compile.t
+t/compat/010-failure.t
+t/compat/020-inc_taint.t
+t/compat/030-nonumbers.t
+t/compat/040-test-harness-compat.t
+t/compat/060-version.t
+t/compat/base.t
+t/compat/callback.t
+t/compat/env.t
+t/compat/failure.t
+t/compat/from_line.t
+t/compat/harness.t
+t/compat/inc-propagation.t
+t/compat/inc_taint.t
+t/compat/nonumbers.t
+t/compat/ok.t
+t/compat/point-parse.t
+t/compat/point.t
+t/compat/prove-globbing.t
+t/compat/prove-switches.t
+t/compat/regression.t
+t/compat/strap-analyze.t
+t/compat/strap.t
+t/compat/subclass.t
+t/compat/switches.t
+t/compat/test-harness-compat.t
+t/compat/test-harness.t
+t/compat/version.t
+t/console.t
+t/data/catme.1
+t/data/execrc
+t/data/proverc
+t/data/sample.yml
+t/errors.t
+t/file.t
+t/glob-to-regexp.t
+t/grammar.t
+t/harness-bailout.t
+t/harness-subclass.t
+t/harness.t
+t/iterator_factory.t
+t/iterators.t
+t/lib/App/Prove/Plugin/Dummy.pm
+t/lib/App/Prove/Plugin/Dummy2.pm
+t/lib/Dev/Null.pm
+t/lib/EmptyParser.pm
+t/lib/IO/Capture.pm
+t/lib/IO/c55Capture.pm
+t/lib/MyCustom.pm
+t/lib/MyFileSourceHandler.pm
+t/lib/MyGrammar.pm
+t/lib/MyIterator.pm
+t/lib/MyIteratorFactory.pm
+t/lib/MyPerlSource.pm
+t/lib/MyPerlSourceHandler.pm
+t/lib/MyResult.pm
+t/lib/MyResultFactory.pm
+t/lib/MyShebangger.pm
+t/lib/MySource.pm
+t/lib/MySourceHandler.pm
+t/lib/NOP.pm
+t/lib/NoFork.pm
+t/lib/TAP/Harness/TestSubclass.pm
+t/lib/TAP/Parser/SubclassTest.pm
+t/lib/Test/Builder.pm
+t/lib/Test/Builder/Module.pm
+t/lib/Test/More.pm
+t/lib/Test/Simple.pm
+t/lib/if.pm
+t/multiplexer.t
+t/nofork-mux.t
+t/nofork.t
+t/object.t
+t/parse.t
+t/parser-config.t
+t/parser-subclass.t
+t/perl5lib.t
+t/pod-coverage.t
+t/pod.t
+t/premature-bailout.t
+t/process.t
+t/prove.t
+t/proveenv.t
+t/proverc.t
+t/proverc/emptyexec
+t/proverun.t
+t/regression.t
+t/results.t
+t/sample-tests/bailout
+t/sample-tests/bignum
+t/sample-tests/bignum_many
+t/sample-tests/combined
+t/sample-tests/combined_compat
+t/sample-tests/delayed
+t/sample-tests/descriptive
+t/sample-tests/descriptive_trailing
+t/sample-tests/die
+t/sample-tests/die_head_end
+t/sample-tests/die_last_minute
+t/sample-tests/die_unfinished
+t/sample-tests/duplicates
+t/sample-tests/echo
+t/sample-tests/empty
+t/sample-tests/escape_eol
+t/sample-tests/escape_hash
+t/sample-tests/head_end
+t/sample-tests/head_fail
+t/sample-tests/inc_taint
+t/sample-tests/junk_before_plan
+t/sample-tests/lone_not_bug
+t/sample-tests/no_nums
+t/sample-tests/no_output
+t/sample-tests/out_err_mix
+t/sample-tests/out_of_order
+t/sample-tests/schwern
+t/sample-tests/schwern-todo-quiet
+t/sample-tests/segfault
+t/sample-tests/sequence_misparse
+t/sample-tests/shbang_misparse
+t/sample-tests/simple
+t/sample-tests/simple_fail
+t/sample-tests/simple_yaml
+t/sample-tests/skip
+t/sample-tests/skip_nomsg
+t/sample-tests/skipall
+t/sample-tests/skipall_nomsg
+t/sample-tests/skipall_v13
+t/sample-tests/space_after_plan
+t/sample-tests/stdout_stderr
+t/sample-tests/strict
+t/sample-tests/switches
+t/sample-tests/taint
+t/sample-tests/taint_warn
+t/sample-tests/todo
+t/sample-tests/todo_inline
+t/sample-tests/todo_misparse
+t/sample-tests/too_many
+t/sample-tests/version_good
+t/sample-tests/version_late
+t/sample-tests/version_old
+t/sample-tests/vms_nit
+t/sample-tests/with_comments
+t/sample-tests/zero_valid
+t/scheduler.t
+t/source.t
+t/source_handler.t
+t/source_tests/harness
+t/source_tests/harness_badtap
+t/source_tests/harness_complain
+t/source_tests/harness_directives
+t/source_tests/harness_failure
+t/source_tests/psql
+t/source_tests/psql.bat
+t/source_tests/source
+t/source_tests/source.1
+t/source_tests/source.bat
+t/source_tests/source.pl
+t/source_tests/source.sh
+t/source_tests/source.t
+t/source_tests/source.tap
+t/source_tests/varsource
+t/spool.t
+t/state.t
+t/state_results.t
+t/streams.t
+t/subclass_tests/non_perl_source
+t/subclass_tests/perl_source
+t/taint.t
+t/testargs.t
+t/unicode.t
+t/utils.t
+t/yamlish-output.t
+t/yamlish-writer.t
+t/yamlish.t
+xt/author/pod-coverage.t
+xt/author/pod.t
+xt/author/stdin.t
+xt/perls/harness_perl.t
+xt/perls/sample-tests/perl_version
diff --git a/cpan/Test-Harness/t/compat/failure.t b/cpan/Test-Harness/t/compat/failure.t
index d199b7b67f..2f80e57884 100644
--- a/cpan/Test-Harness/t/compat/failure.t
+++ b/cpan/Test-Harness/t/compat/failure.t
@@ -19,18 +19,8 @@ use Test::Harness;
         return sub { $died = 1 }
     }
 
-    my $sample_tests;
-    if ( $ENV{PERL_CORE} ) {
-        my $updir = File::Spec->updir;
-        $sample_tests = File::Spec->catdir(
-            $updir, 'ext', 'Test-Harness', 't',
-            'sample-tests'
-        );
-    }
-    else {
-        my $curdir = File::Spec->curdir;
-        $sample_tests = File::Spec->catdir( $curdir, 't', 'sample-tests' );
-    }
+    my $curdir = File::Spec->curdir;
+    my $sample_tests = File::Spec->catdir( $curdir, 't', 'sample-tests' );
 
     {
         local $SIG{__DIE__} = prepare_for_death();
diff --git a/cpan/Test-Harness/t/compat/inc_taint.t b/cpan/Test-Harness/t/compat/inc_taint.t
index b0917dbb99..e74ede02cd 100644
--- a/cpan/Test-Harness/t/compat/inc_taint.t
+++ b/cpan/Test-Harness/t/compat/inc_taint.t
@@ -1,13 +1,7 @@
 #!/usr/bin/perl -w
 
 BEGIN {
-    if ( $ENV{PERL_CORE} ) {
-        chdir 't';
-        @INC = ( '../lib', '../ext/Test-Harness/t/lib' );
-    }
-    else {
-        use lib 't/lib';
-    }
+  use lib 't/lib';
 }
 
 use strict;
@@ -34,9 +28,7 @@ sub _all_ok {
     select NULL;
     my ( $tot, $failed ) = Test::Harness::execute_tests(
         tests => [
-            $ENV{PERL_CORE}
-            ? '../ext/Test-Harness/t/sample-tests/inc_taint'
-            : 't/sample-tests/inc_taint'
+            't/sample-tests/inc_taint'
         ]
     );
     select STDOUT;
diff --git a/cpan/Test-Harness/t/compat/test-harness-compat.t b/cpan/Test-Harness/t/compat/test-harness-compat.t
index 0009df16f8..0951c97f9d 100644
--- a/cpan/Test-Harness/t/compat/test-harness-compat.t
+++ b/cpan/Test-Harness/t/compat/test-harness-compat.t
@@ -1,13 +1,7 @@
 #!/usr/bin/perl -w
 
 BEGIN {
-    if ( $ENV{PERL_CORE} ) {
-        chdir 't';
-        @INC = '../lib';
-    }
-    else {
-        unshift @INC, 't/lib';
-    }
+  unshift @INC, 't/lib';
 }
 
 use strict;
@@ -22,7 +16,7 @@ use Test::Harness qw(execute_tests);
 local $ENV{HARNESS_PERL_SWITCHES};
 
 my $TEST_DIR
-  = $ENV{PERL_CORE} ? '../ext/Test-Harness/t/sample-tests' : 't/sample-tests';
+  = 't/sample-tests';
 
 {
 
diff --git a/cpan/Test-Harness/t/file.t b/cpan/Test-Harness/t/file.t
index 40793c3d42..3f4a84d1d6 100644
--- a/cpan/Test-Harness/t/file.t
+++ b/cpan/Test-Harness/t/file.t
@@ -1,13 +1,7 @@
 #!/usr/bin/perl -w
 
 BEGIN {
-    if ( $ENV{PERL_CORE} ) {
-        chdir 't';
-        @INC = ( '../lib', '../ext/Test-Harness/t/lib' );
-    }
-    else {
-        unshift @INC, 't/lib';
-    }
+  unshift @INC, 't/lib';
 }
 
 use strict;
@@ -19,9 +13,9 @@ use TAP::Harness;
 my $HARNESS = 'TAP::Harness';
 
 my $source_tests
-  = $ENV{PERL_CORE} ? '../ext/Test-Harness/t/source_tests' : 't/source_tests';
+  = 't/source_tests';
 my $sample_tests
-  = $ENV{PERL_CORE} ? '../ext/Test-Harness/t/sample-tests' : 't/sample-tests';
+  = 't/sample-tests';
 
 plan tests => 56;
 
diff --git a/cpan/Test-Harness/t/grammar.t b/cpan/Test-Harness/t/grammar.t
index e94c995ffd..51f45d27ed 100644
--- a/cpan/Test-Harness/t/grammar.t
+++ b/cpan/Test-Harness/t/grammar.t
@@ -3,13 +3,7 @@
 use strict;
 
 BEGIN {
-    if ( $ENV{PERL_CORE} ) {
-        chdir 't';
-        @INC = ( '../lib', '../ext/Test-Harness/t/lib' );
-    }
-    else {
-        unshift @INC, 't/lib';
-    }
+  unshift @INC, 't/lib';
 }
 
 use Test::More tests => 94;
diff --git a/cpan/Test-Harness/t/harness-bailout.t b/cpan/Test-Harness/t/harness-bailout.t
index 0ee8a793d6..fd1dc35669 100644
--- a/cpan/Test-Harness/t/harness-bailout.t
+++ b/cpan/Test-Harness/t/harness-bailout.t
@@ -35,10 +35,6 @@ for my $test (@jobs) {
 
         $harness->runtests(
             File::Spec->catfile(
-                (   $ENV{PERL_CORE}
-                    ? ( File::Spec->updir, 'ext', 'Test-Harness' )
-                    : ()
-                ),
                 't',
                 'sample-tests',
                 'bailout'
diff --git a/cpan/Test-Harness/t/harness-subclass.t b/cpan/Test-Harness/t/harness-subclass.t
index c7d30c88e7..95e740fded 100644
--- a/cpan/Test-Harness/t/harness-subclass.t
+++ b/cpan/Test-Harness/t/harness-subclass.t
@@ -1,13 +1,7 @@
 #!/usr/bin/perl -w
 
 BEGIN {
-    if ( $ENV{PERL_CORE} ) {
-        chdir 't';
-        @INC = ( '../lib', '../ext/Test-Harness/t/lib' );
-    }
-    else {
-        unshift @INC, 't/lib';
-    }
+  unshift @INC, 't/lib';
 }
 
 use strict;
@@ -53,10 +47,6 @@ for my $class ( values %class_map ) {
 
     my $aggregate = $harness->runtests(
         File::Spec->catfile(
-            (   $ENV{PERL_CORE}
-                ? ( File::Spec->updir, 'ext', 'Test-Harness' )
-                : ()
-            ),
             't',
             'sample-tests',
             'simple'
diff --git a/cpan/Test-Harness/t/harness.t b/cpan/Test-Harness/t/harness.t
index 6c5c1d19a0..1ba4b491ff 100644
--- a/cpan/Test-Harness/t/harness.t
+++ b/cpan/Test-Harness/t/harness.t
@@ -1,13 +1,7 @@
 #!/usr/bin/perl -w
 
 BEGIN {
-    if ( $ENV{PERL_CORE} ) {
-        chdir 't';
-        @INC = ( '../lib', '../ext/Test-Harness/t/lib' );
-    }
-    else {
-        unshift @INC, 't/lib';
-    }
+   unshift @INC, 't/lib';
 }
 
 use strict;
@@ -20,9 +14,9 @@ use TAP::Harness;
 my $HARNESS = 'TAP::Harness';
 
 my $source_tests
-  = $ENV{PERL_CORE} ? '../ext/Test-Harness/t/source_tests' : 't/source_tests';
+  = 't/source_tests';
 my $sample_tests
-  = $ENV{PERL_CORE} ? '../ext/Test-Harness/t/sample-tests' : 't/sample-tests';
+  = 't/sample-tests';
 
 plan tests => 128;
 
@@ -545,9 +539,7 @@ SKIP: {
     eval {
         _runtests(
             $harness,
-            $ENV{PERL_CORE}
-            ? '../ext/Test-Harness/t/data/catme.1'
-            : 't/data/catme.1'
+            't/data/catme.1'
         );
     };
 
@@ -595,9 +587,7 @@ SKIP: {
             exec      => sub {
                 return [
                     $cat,
-                    $ENV{PERL_CORE}
-                    ? '../ext/Test-Harness/t/data/catme.1'
-                    : 't/data/catme.1'
+                    't/data/catme.1'
                 ];
             },
         }
@@ -645,9 +635,7 @@ SKIP: {
             stdout    => $capture,
             exec      => sub {
                 open my $fh,
-                  $ENV{PERL_CORE}
-                  ? '../ext/Test-Harness/t/data/catme.1'
-                  : 't/data/catme.1';
+                  't/data/catme.1';
                 return $fh;
             },
         }
@@ -978,11 +966,7 @@ sub _runtests {
     # coverage tests for the basically untested T::H::_open_spool
 
     my @spool = (
-        (   $ENV{PERL_CORE}
-            ? ( File::Spec->updir(), 'ext', 'Test-Harness' )
-            : ()
-        ),
-        ( 't', 'spool' )
+        't', 'spool'
     );
     $ENV{PERL_TEST_HARNESS_DUMP_TAP} = File::Spec->catfile(@spool);
 
diff --git a/cpan/Test-Harness/t/iterator_factory.t b/cpan/Test-Harness/t/iterator_factory.t
index 668045c7a8..c0e3e5c8b4 100644
--- a/cpan/Test-Harness/t/iterator_factory.t
+++ b/cpan/Test-Harness/t/iterator_factory.t
@@ -4,13 +4,7 @@
 ##
 
 BEGIN {
-    if ( $ENV{PERL_CORE} ) {
-        chdir 't';
-        @INC = ( '../lib', '../ext/Test-Harness/t/lib' );
-    }
-    else {
-        unshift @INC, 't/lib';
-    }
+  unshift @INC, 't/lib';
 }
 
 use strict;
@@ -77,10 +71,6 @@ use_ok('TAP::Parser::SourceHandler::RawTAP');
 use_ok('TAP::Parser::SourceHandler::Handle');
 
 my $test_dir = File::Spec->catdir(
-    (   $ENV{PERL_CORE}
-        ? ( File::Spec->updir(), 'ext', 'Test-Harness' )
-        : ()
-    ),
     't',
     'source_tests'
 );
diff --git a/cpan/Test-Harness/t/iterators.t b/cpan/Test-Harness/t/iterators.t
index 2b6028e0a2..0321772a56 100644
--- a/cpan/Test-Harness/t/iterators.t
+++ b/cpan/Test-Harness/t/iterators.t
@@ -42,10 +42,6 @@ my @schedule = (
             command => [
                 $^X,
                 File::Spec->catfile(
-                    (   $ENV{PERL_CORE}
-                        ? ( File::Spec->updir(), 'ext', 'Test-Harness' )
-                        : ()
-                    ),
                     't',
                     'sample-tests',
                     'out_err_mix'
diff --git a/cpan/Test-Harness/t/multiplexer.t b/cpan/Test-Harness/t/multiplexer.t
index 3598521bdf..649d5d161f 100644
--- a/cpan/Test-Harness/t/multiplexer.t
+++ b/cpan/Test-Harness/t/multiplexer.t
@@ -56,11 +56,6 @@ my @schedule = (
             return [
                 TAP::Parser->new(
                     {   source => File::Spec->catfile(
-                            (   $ENV{PERL_CORE}
-                                ? ( File::Spec->updir(), 'ext', 'Test-Harness'
-                                  )
-                                : ()
-                            ),
                             't',
                             'sample-tests',
                             'simple'
@@ -82,12 +77,6 @@ my @schedule = (
             return map {
                 [   TAP::Parser->new(
                         {   source => File::Spec->catfile(
-                                (   $ENV{PERL_CORE}
-                                    ? ( File::Spec->updir(), 'ext',
-                                        'Test-Harness'
-                                      )
-                                    : ()
-                                ),
                                 't',
                                 'sample-tests',
                                 'simple'
@@ -129,12 +118,6 @@ my @schedule = (
               ( map {
                     [   TAP::Parser->new(
                             {   source => File::Spec->catfile(
-                                    (   $ENV{PERL_CORE}
-                                        ? ( File::Spec->updir(), 'ext',
-                                            'Test-Harness'
-                                          )
-                                        : ()
-                                    ),
                                     't',
                                     'sample-tests',
                                     'simple'
diff --git a/cpan/Test-Harness/t/nofork-mux.t b/cpan/Test-Harness/t/nofork-mux.t
index 1dba20d470..bc26588f57 100644
--- a/cpan/Test-Harness/t/nofork-mux.t
+++ b/cpan/Test-Harness/t/nofork-mux.t
@@ -1,17 +1,11 @@
 #!/usr/bin/perl -w
 
 BEGIN {
-    if ( $ENV{PERL_CORE} ) {
-        chdir 't';
-        @INC = ( '../lib', '../ext/Test-Harness/t/lib' );
-    }
-    else {
-        use lib 't/lib';
-    }
+  use lib 't/lib';
 }
 
 use strict;
 
 use NoFork;
 require(
-    ( $ENV{PERL_CORE} ? '../ext/Test-Harness/' : '' ) . 't/multiplexer.t' );
+    't/multiplexer.t' );
diff --git a/cpan/Test-Harness/t/nofork.t b/cpan/Test-Harness/t/nofork.t
index 01375e034b..00b8dd6dd5 100755
--- a/cpan/Test-Harness/t/nofork.t
+++ b/cpan/Test-Harness/t/nofork.t
@@ -4,13 +4,7 @@
 # NOTE maybe a good candidate for xt/author or something.
 
 BEGIN {
-    if ( $ENV{PERL_CORE} ) {
-        chdir 't';
-        @INC = ( '../lib', '../ext/Test-Harness/t/lib' );
-    }
-    else {
-        use lib 't/lib';
-    }
+  use lib 't/lib';
 }
 
 use strict;
@@ -57,8 +51,8 @@ my $mod = 'TAP::Parser::Iterator::Process';
             stdout    => $capture,
         }
     );
-    $harness->runtests( ( $ENV{PERL_CORE} ? '../ext/Test-Harness/' : '' )
-        . 't/sample-tests/simple' );
+    $harness->runtests( 
+        't/sample-tests/simple' );
     my @output = tied($$capture)->dump;
     is pop @output, "Result: PASS\n", 'status OK';
     pop @output;    # get rid of summary line
diff --git a/cpan/Test-Harness/t/parse.t b/cpan/Test-Harness/t/parse.t
index 97db067da9..68c1df53db 100755
--- a/cpan/Test-Harness/t/parse.t
+++ b/cpan/Test-Harness/t/parse.t
@@ -3,13 +3,7 @@
 use strict;
 
 BEGIN {
-    if ( $ENV{PERL_CORE} ) {
-        chdir 't';
-        @INC = ( '../lib', '../ext/Test-Harness/t/lib' );
-    }
-    else {
-        use lib 't/lib';
-    }
+  use lib 't/lib';
 }
 
 use Test::More tests => 294;
@@ -453,9 +447,8 @@ is( scalar @results, 2, "Got two lines of TAP" );
 
 # Check source => $filehandle
 can_ok $PARSER, 'new';
-open my $fh, $ENV{PERL_CORE}
-  ? '../ext/Test-Harness/t/data/catme.1'
-  : 't/data/catme.1';
+open my $fh,
+  't/data/catme.1';
 $parser = $PARSER->new( { source => $fh } );
 isa_ok $parser, $PARSER, '... and calling it should succeed';
 ok @results = _get_results($parser), 'The parser should return results';
@@ -632,10 +625,6 @@ END_TAP
 
     my $parser = TAP::Parser->new(
         {   source => File::Spec->catfile(
-                (   $ENV{PERL_CORE}
-                    ? ( File::Spec->updir(), 'ext', 'Test-Harness' )
-                    : ()
-                ),
                 't',
                 'sample-tests',
                 'simple'
diff --git a/cpan/Test-Harness/t/parser-config.t b/cpan/Test-Harness/t/parser-config.t
index 1e0b719947..ca61b71922 100644
--- a/cpan/Test-Harness/t/parser-config.t
+++ b/cpan/Test-Harness/t/parser-config.t
@@ -1,13 +1,7 @@
 #!/usr/bin/perl -w
 
 BEGIN {
-    if ( $ENV{PERL_CORE} ) {
-        chdir 't';
-        @INC = ( '../lib', '../ext/Test-Harness/t/lib' );
-    }
-    else {
-        unshift @INC, 't/lib';
-    }
+  unshift @INC, 't/lib';
 }
 
 use strict;
@@ -20,7 +14,7 @@ use TAP::Parser;
 use_ok('MyGrammar');
 use_ok('MyResultFactory');
 
-my @t_path = $ENV{PERL_CORE} ? ( updir(), 'ext', 'Test-Harness' ) : ();
+my @t_path = ();
 my $source = catfile( @t_path, 't', 'source_tests', 'source' );
 my %customize = (
     grammar_class        => 'MyGrammar',
diff --git a/cpan/Test-Harness/t/parser-subclass.t b/cpan/Test-Harness/t/parser-subclass.t
index 2935722427..a798bfde24 100644
--- a/cpan/Test-Harness/t/parser-subclass.t
+++ b/cpan/Test-Harness/t/parser-subclass.t
@@ -1,13 +1,7 @@
 #!/usr/bin/perl -w
 
 BEGIN {
-    if ( $ENV{PERL_CORE} ) {
-        chdir 't';
-        @INC = ( '../lib', '../ext/Test-Harness/t/lib' );
-    }
-    else {
-        unshift @INC, 't/lib';
-    }
+  unshift @INC, 't/lib';
 }
 
 use strict;
@@ -19,7 +13,7 @@ use File::Spec::Functions qw( catfile updir );
 use_ok('TAP::Parser::SubclassTest');
 
 # TODO: for my $source ( ... ) ?
-my @t_path = $ENV{PERL_CORE} ? ( updir(), 'ext', 'Test-Harness' ) : ();
+my @t_path = ();
 
 {    # perl source
     %INIT = %CUSTOM = ();
diff --git a/cpan/Test-Harness/t/perl5lib.t b/cpan/Test-Harness/t/perl5lib.t
index 51113e156b..3947aa6055 100644
--- a/cpan/Test-Harness/t/perl5lib.t
+++ b/cpan/Test-Harness/t/perl5lib.t
@@ -31,7 +31,7 @@ use App::Prove;
 # Change PERL5LIB so we ensure it's preserved.
 $ENV{PERL5LIB} = join(
     $path_sep, 'wibble',
-    ( $ENV{PERL_CORE} ? '../lib' : () ), $ENV{PERL5LIB} || ''
+    $ENV{PERL5LIB} || ''
 );
 
 open TEST, ">perl5lib_check.t.tmp";
diff --git a/cpan/Test-Harness/t/process.t b/cpan/Test-Harness/t/process.t
index 63a8620dfc..5135d67f95 100644
--- a/cpan/Test-Harness/t/process.t
+++ b/cpan/Test-Harness/t/process.t
@@ -28,10 +28,6 @@ my @expect = (
 );
 
 my $source = File::Spec->catfile(
-    (   $ENV{PERL_CORE}
-        ? ( File::Spec->updir(), 'ext', 'Test-Harness' )
-        : ()
-    ),
     't',
     'sample-tests',
     'delayed'
diff --git a/cpan/Test-Harness/t/prove.t b/cpan/Test-Harness/t/prove.t
index 9a9d36f768..37e211866b 100644
--- a/cpan/Test-Harness/t/prove.t
+++ b/cpan/Test-Harness/t/prove.t
@@ -1,13 +1,7 @@
 #!/usr/bin/perl -w
 
 BEGIN {
-    if ( $ENV{PERL_CORE} ) {
-        chdir 't';
-        @INC = ( '../lib', '../ext/Test-Harness/t/lib' );
-    }
-    else {
-        unshift @INC, 't/lib';
-    }
+  unshift @INC, 't/lib';
 }
 
 use strict;
@@ -1017,9 +1011,7 @@ BEGIN {    # START PLAN
             args => {
                 argv => [qw( one two three )],
             },
-            proverc => $ENV{PERL_CORE}
-            ? '../ext/Test-Harness/t/proverc/emptyexec'
-            : 't/proverc/emptyexec',
+            proverc => 't/proverc/emptyexec',
             switches => [$dummy_test],
             expect   => { exec => '' },
             runlog   => [
diff --git a/cpan/Test-Harness/t/proverc.t b/cpan/Test-Harness/t/proverc.t
index 5a7d97e161..a8b647e177 100644
--- a/cpan/Test-Harness/t/proverc.t
+++ b/cpan/Test-Harness/t/proverc.t
@@ -1,13 +1,7 @@
 #!/usr/bin/perl -w
 
 BEGIN {
-    if ( $ENV{PERL_CORE} ) {
-        chdir 't';
-        @INC = ( '../lib', 'lib' );
-    }
-    else {
-        unshift @INC, 't/lib';
-    }
+  unshift @INC, 't/lib';
 }
 
 use strict;
@@ -20,10 +14,6 @@ my $prove = App::Prove->new;
 
 $prove->add_rc_file(
     File::Spec->catfile(
-        (   $ENV{PERL_CORE}
-            ? ( File::Spec->updir(), 'ext', 'Test-Harness' )
-            : ()
-        ),
         't', 'data',
         'proverc'
     )
diff --git a/cpan/Test-Harness/t/proverun.t b/cpan/Test-Harness/t/proverun.t
index 50396279db..cdbd148374 100644
--- a/cpan/Test-Harness/t/proverun.t
+++ b/cpan/Test-Harness/t/proverun.t
@@ -1,13 +1,7 @@
 #!/usr/bin/perl -w
 
 BEGIN {
-    if ( $ENV{PERL_CORE} ) {
-        chdir 't';
-        @INC = ( '../lib', 'lib' );
-    }
-    else {
-        unshift @INC, 't/lib';
-    }
+  unshift @INC, 't/lib';
 }
 
 use strict;
@@ -19,10 +13,6 @@ my @SCHEDULE;
 
 BEGIN {
     my $t_dir = File::Spec->catdir(
-        (   $ENV{PERL_CORE}
-            ? ( File::Spec->updir(), 'ext', 'Test-Harness' )
-            : ()
-        ),
         't'
     );
 
diff --git a/cpan/Test-Harness/t/regression.t b/cpan/Test-Harness/t/regression.t
index b86dd07233..498f3de62a 100644
--- a/cpan/Test-Harness/t/regression.t
+++ b/cpan/Test-Harness/t/regression.t
@@ -1,13 +1,7 @@
 #!/usr/bin/perl -w
 
 BEGIN {
-    if ( $ENV{PERL_CORE} ) {
-        chdir 't';
-        @INC = '../lib';
-    }
-    else {
-        push @INC, 't/lib';
-    }
+  push @INC, 't/lib';
 }
 
 use strict;
@@ -30,10 +24,6 @@ my $IsWin32 = $^O eq 'MSWin32';
 
 my $SAMPLE_TESTS = File::Spec->catdir(
     File::Spec->curdir,
-    (   $ENV{PERL_CORE}
-        ? ( File::Spec->updir(), 'ext', 'Test-Harness' )
-        : ()
-    ),
     't',
     'sample-tests'
 );
@@ -3170,8 +3160,7 @@ for my $hide_fork ( 0 .. $can_open3 ) {
         # Test::Builder::failure_output() method to be overridden when
         # TAP::Parser is not installed.  Otherwise, these tests will fail.
 
-        unshift @{ $args->{switches} },
-          $ENV{PERL_CORE} ? ( map {"-I$_"} @INC ) : ('-It/lib');
+        unshift @{ $args->{switches} }, '-It/lib';
 
         $args->{source} = File::Spec->catfile( $SAMPLE_TESTS, $test );
         $args->{merge} = !$hide_fork;
diff --git a/cpan/Test-Harness/t/sample-tests/delayed b/cpan/Test-Harness/t/sample-tests/delayed
index f016a69348..1f24ef6790 100644
--- a/cpan/Test-Harness/t/sample-tests/delayed
+++ b/cpan/Test-Harness/t/sample-tests/delayed
@@ -1,10 +1,4 @@
 # Used to test Process.pm
-BEGIN {
-    if ( $ENV{PERL_CORE} ) {
-        @INC = '../lib';
-    }
-}
-
 use Time::HiRes qw(sleep);
 
 my $delay = 0.01;
diff --git a/cpan/Test-Harness/t/source.t b/cpan/Test-Harness/t/source.t
index 80b74f5bc8..3950143e0d 100755
--- a/cpan/Test-Harness/t/source.t
+++ b/cpan/Test-Harness/t/source.t
@@ -1,13 +1,7 @@
 #!/usr/bin/perl -w
 
 BEGIN {
-    if ( $ENV{PERL_CORE} ) {
-        chdir 't';
-        @INC = ( '../lib', '../ext/Test-Harness/t/lib' );
-    }
-    else {
-        unshift @INC, 't/lib';
-    }
+  unshift @INC, 't/lib';
 }
 
 use strict;
@@ -16,10 +10,6 @@ use Test::More tests => 45;
 use File::Spec;
 
 my $dir = File::Spec->catdir(
-    (   $ENV{PERL_CORE}
-        ? ( File::Spec->updir(), 'ext', 'Test-Harness' )
-        : ()
-    ),
     't',
     'source_tests'
 );
diff --git a/cpan/Test-Harness/t/source_handler.t b/cpan/Test-Harness/t/source_handler.t
index d06a26fb82..d38f094334 100644
--- a/cpan/Test-Harness/t/source_handler.t
+++ b/cpan/Test-Harness/t/source_handler.t
@@ -1,13 +1,7 @@
 #!/usr/bin/perl -w
 
 BEGIN {
-    if ( $ENV{PERL_CORE} ) {
-        chdir 't';
-        @INC = ( '../lib', '../ext/Test-Harness/t/lib' );
-    }
-    else {
-        unshift @INC, 't/lib';
-    }
+   unshift @INC, 't/lib';
 }
 
 use strict;
@@ -27,10 +21,6 @@ my $HAS_SH   = -x '/bin/sh';
 my $HAS_ECHO = -x '/bin/echo';
 
 my $dir = File::Spec->catdir(
-    (   $ENV{PERL_CORE}
-        ? ( File::Spec->updir(), 'ext', 'Test-Harness' )
-        : ()
-    ),
     't',
     'source_tests'
 );
diff --git a/cpan/Test-Harness/t/source_tests/source b/cpan/Test-Harness/t/source_tests/source
index a7dc38e34f..a176152174 100644
--- a/cpan/Test-Harness/t/source_tests/source
+++ b/cpan/Test-Harness/t/source_tests/source
@@ -1,13 +1,7 @@
 #!/usr/bin/perl -wT
 
 BEGIN {
-    if ( $ENV{PERL_CORE} ) {
-        chdir 't';
-        @INC = ( '../lib', 'lib' );
-    }
-    else {
-        unshift @INC, 't/lib';
-    }
+  unshift @INC, 't/lib';
 }
 
 use Test::More tests => 1;
diff --git a/cpan/Test-Harness/t/spool.t b/cpan/Test-Harness/t/spool.t
index 62227da4fd..1e80019a01 100644
--- a/cpan/Test-Harness/t/spool.t
+++ b/cpan/Test-Harness/t/spool.t
@@ -1,13 +1,7 @@
 #!/usr/bin/perl -w
 
 BEGIN {
-    if ( $ENV{PERL_CORE} ) {
-        chdir 't';
-        @INC = ( '../lib', 'lib' );
-    }
-    else {
-        unshift @INC, 't/lib';
-    }
+  unshift @INC, 't/lib';
 }
 
 # test T::H::_open_spool and _close_spool - these are good examples
@@ -67,7 +61,7 @@ plan tests => 4;
 
     # coverage tests for the basically untested T::H::_open_spool
 
-    my @spool = ( $ENV{PERL_CORE} ? ('spool') : ( 't', 'spool' ) );
+    my @spool = ( 't', 'spool' );
     $ENV{PERL_TEST_HARNESS_DUMP_TAP} = File::Spec->catfile(@spool);
 
 # now given that we're going to be writing stuff to the file system, make sure we have
diff --git a/cpan/Test-Harness/t/state.t b/cpan/Test-Harness/t/state.t
index a2a58e729c..668c24bc38 100644
--- a/cpan/Test-Harness/t/state.t
+++ b/cpan/Test-Harness/t/state.t
@@ -1,13 +1,7 @@
 #!/usr/bin/perl -w
 
 BEGIN {
-    if ( $ENV{PERL_CORE} ) {
-        chdir 't';
-        @INC = '../lib';
-    }
-    else {
-        unshift @INC, 't/lib';
-    }
+  unshift @INC, 't/lib';
 }
 
 use strict;
@@ -16,7 +10,7 @@ use App::Prove::State;
 use App::Prove::State::Result;
 
 sub mn {
-    my $pfx = $ENV{PERL_CORE} ? '../ext/Test-Harness/' : '';
+    my $pfx = '';
     return map {"$pfx$_"} @_;
 }
 
diff --git a/cpan/Test-Harness/t/state_results.t b/cpan/Test-Harness/t/state_results.t
index db532c91c1..e49ecd87d1 100644
--- a/cpan/Test-Harness/t/state_results.t
+++ b/cpan/Test-Harness/t/state_results.t
@@ -1,13 +1,7 @@
 #!/usr/bin/perl -w
 
 BEGIN {
-    if ( $ENV{PERL_CORE} ) {
-        chdir 't';
-        @INC = '../lib';
-    }
-    else {
-        unshift @INC, 't/lib';
-    }
+  unshift @INC, 't/lib';
 }
 
 use strict;
diff --git a/cpan/Test-Harness/t/taint.t b/cpan/Test-Harness/t/taint.t
index 80acec8fb1..26e46320e2 100644
--- a/cpan/Test-Harness/t/taint.t
+++ b/cpan/Test-Harness/t/taint.t
@@ -1,13 +1,7 @@
 #!/usr/bin/perl -w
 
 BEGIN {
-    if ( $ENV{PERL_CORE} ) {
-        chdir 't';
-        @INC = ( '../lib', 'lib' );
-    }
-    else {
         unshift @INC, 't/lib';
-    }
 }
 
 # Test that options in PERL5OPT are propogated to tainted tests
@@ -43,7 +37,7 @@ sub run_test_file {
 }
 
 {
-    local $ENV{PERL5OPT} = $ENV{PERL_CORE} ? '-I../lib -Mstrict' : '-Mstrict';
+    local $ENV{PERL5OPT} = '-Mstrict';
     run_test_file(<<'END');
 #!/usr/bin/perl -T
 
diff --git a/cpan/Test-Harness/t/testargs.t b/cpan/Test-Harness/t/testargs.t
index 8ac9035bf9..5e9cc5c489 100644
--- a/cpan/Test-Harness/t/testargs.t
+++ b/cpan/Test-Harness/t/testargs.t
@@ -1,9 +1,5 @@
 #!/usr/bin/perl -w
 
-BEGIN {
-    chdir 't' and @INC = '../lib' if $ENV{PERL_CORE};
-}
-
 use strict;
 use lib 't/lib';
 
@@ -14,10 +10,6 @@ use TAP::Harness;
 use App::Prove;
 
 my $test = File::Spec->catfile(
-    (   $ENV{PERL_CORE}
-        ? ( File::Spec->updir(), 'ext', 'Test-Harness' )
-        : ()
-    ),
     't',
     'sample-tests',
     'echo'
diff --git a/cpan/Test-Harness/t/utils.t b/cpan/Test-Harness/t/utils.t
index d60c8a2939..4851ac1f1c 100644
--- a/cpan/Test-Harness/t/utils.t
+++ b/cpan/Test-Harness/t/utils.t
@@ -1,9 +1,5 @@
 #!/usr/bin/perl -w
 
-BEGIN {
-    chdir 't' and @INC = '../lib' if $ENV{PERL_CORE};
-}
-
 use strict;
 use lib 't/lib';