4 files changed, 17 insertions, 8 deletions
diff --git a/cpan/Module-Metadata/t/extract-package.t b/cpan/Module-Metadata/t/extract-package.t
index 143372af88..43c40128b3 100644
--- a/cpan/Module-Metadata/t/extract-package.t
+++ b/cpan/Module-Metadata/t/extract-package.t
@@ -159,7 +159,8 @@ foreach my $test_case (@pkg_names) {
             or $errs++;
   }
     is( $warnings, '', "case $test_case->{name}: no warnings from parsing" ) or $errs++;
-    diag "Got: '" . join(', ', @got) . "'\nModule contents:\n$code" if !$ENV{PERL_CORE} && $errs;
+    diag "Got: '" . join(', ', @got) . "'\nModule contents:\n$code"
+      if $errs and not $ENV{PERL_CORE} and ($ENV{AUTHOR_TESTING} or $ENV{AUTOMATED_TESTING});
 }
 continue {
   ++$test_num;
diff --git a/cpan/Module-Metadata/t/extract-version.t b/cpan/Module-Metadata/t/extract-version.t
index dea690b4d3..345a457a7b 100644
--- a/cpan/Module-Metadata/t/extract-version.t
+++ b/cpan/Module-Metadata/t/extract-version.t
@@ -690,7 +690,8 @@ foreach my $test_case (@modules) {
     }
 
     is( $warnings, '', "case '$test_case->{name}': no warnings from parsing" ) or $errs++;
-    diag 'parsed module: ', explain($pm_info) if !$ENV{PERL_CORE} && $errs;
+    diag 'parsed module: ', explain($pm_info) if $errs and not $ENV{PERL_CORE}
+      and ($ENV{AUTHOR_TESTING} or $ENV{AUTOMATED_TESTING});
   }
 }
 continue {
diff --git a/cpan/Module-Metadata/t/lib/GeneratePackage.pm b/cpan/Module-Metadata/t/lib/GeneratePackage.pm
index dd48aab5fd..2a910f89bf 100644
--- a/cpan/Module-Metadata/t/lib/GeneratePackage.pm
+++ b/cpan/Module-Metadata/t/lib/GeneratePackage.pm
@@ -17,18 +17,21 @@ BEGIN {
   sub _original_cwd { return $cwd }
 }
 
+my @tmpdirs;
 sub tmpdir {
   my (@args) = @_;
-  File::Temp::tempdir(
+  my $tmpdir = File::Temp::tempdir(
     'MMD-XXXXXXXX',
     CLEANUP => 0,
     DIR => ($ENV{PERL_CORE} ? _original_cwd : File::Spec->tmpdir),
     @args,
   );
+  Test::More::note "using temp dir $tmpdir";
+  push @tmpdirs, $tmpdir;
+  return $tmpdir;
 }
 
 my $tmp;
-BEGIN { $tmp = tmpdir; Test::More::note "using temp dir $tmp"; }
 
 sub generate_file {
   my ($dir, $rel_filename, $content) = @_;
@@ -48,9 +51,11 @@ sub generate_file {
 END {
   die "tests failed; leaving temp dir $tmp behind"
     if $ENV{AUTHOR_TESTING} and not Test::Builder->new->is_passing;
-  Test::More::note "removing temp dir $tmp";
   chdir _original_cwd;
-  File::Path::rmtree($tmp);
+  foreach my $tmp (@tmpdirs) {
+    Test::More::note "removing temp dir $tmp";
+    File::Path::rmtree($tmp);
+  }
 }
 
 1;
diff --git a/cpan/Module-Metadata/t/metadata.t b/cpan/Module-Metadata/t/metadata.t
index fc9bd59441..0f2e414c7f 100644
--- a/cpan/Module-Metadata/t/metadata.t
+++ b/cpan/Module-Metadata/t/metadata.t
@@ -196,7 +196,8 @@ foreach my $script ( @scripts ) {
   is( $pm_info->version, '0.01', "correct script version ($i of $n)" ) or $errs++;
   $i++;
 
-  diag 'parsed module: ', explain($pm_info) if !$ENV{PERL_CORE} && $errs;
+  diag 'parsed module: ', explain($pm_info) if $errs and not $ENV{PERL_CORE}
+    and ($ENV{AUTHOR_TESTING} or $ENV{AUTOMATED_TESTING});
 }
 
 {
@@ -351,7 +352,8 @@ Hello, this is pod.
   )
   or $errs++;
 
-  diag 'parsed module: ', explain($pm_info) if !$ENV{PERL_CORE} && $errs;
+  diag 'parsed module: ', explain($pm_info) if $errs and not $ENV{PERL_CORE}
+    and ($ENV{AUTHOR_TESTING} or $ENV{AUTOMATED_TESTING});
 }
 
 {