1 files changed, 7 insertions, 21 deletions

diff --git a/cpan/Module-Build/t/metadata2.t b/cpan/Module-Build/t/metadata2.t
index a5af034dc0..954b6589a0 100644
--- a/cpan/Module-Build/t/metadata2.t
+++ b/cpan/Module-Build/t/metadata2.t
@@ -2,14 +2,11 @@
 
 use strict;
 use lib 't/lib';
-use MBTest tests => 20;
+use MBTest tests => 18;
 
-use_ok 'Module::Build';
-ensure_blib('Module::Build');
+blib_load('Module::Build');
+blib_load('Module::Build::ConfigData');
 
-my $tmp = MBTest->tmpdir;
-
-use Module::Build::ConfigData;
 use DistGen;
 
 
@@ -19,14 +16,12 @@ SKIP: {
   skip( 'YAML_support feature is not enabled', 4 )
       unless Module::Build::ConfigData->feature('YAML_support');
 
-  my $dist = DistGen->new( dir => $tmp, no_manifest => 1 );
-  $dist->regen;
-
-  $dist->chdir_in;
+  my $dist = DistGen->new( no_manifest => 1 )->chdir_in->regen;
 
   ok ! -e 'MANIFEST';
 
-  my $mb = Module::Build->new_from_context;
+  my $mb;
+  stderr_of( sub { $mb = Module::Build->new_from_context } );
 
   my $out;
   $out = eval { stderr_of(sub{$mb->dispatch('distmeta')}) };
@@ -36,7 +31,6 @@ SKIP: {
 
   ok -e 'META.yml';
 
-  $dist->remove;
 }
 
 
@@ -62,7 +56,7 @@ Simple Simon <simon@simple.sim>
 =cut
 ---
 
-my $dist = DistGen->new( dir => $tmp );
+my $dist = DistGen->new->chdir_in;
 
 $dist->change_build_pl
 ({
@@ -71,10 +65,6 @@ $dist->change_build_pl
     license             => 'perl',
     create_readme       => 1,
 });
-$dist->regen;
-
-$dist->chdir_in;
-
 
 # .pm File with pod
 #
@@ -139,7 +129,3 @@ is( $mb->dist_author->[0], 'Simple Simon <simon@simple.sim>',
 is( $mb->dist_abstract, "A simple module",
     "Extracting abstract from .pod over .pm");
 
-
-############################################################
-# cleanup
-$dist->remove;