diff --git a/Changes b/Changes
index 361efcb..406ff68 100644
--- a/Changes
+++ b/Changes
@@ -24,7 +24,7 @@ Release history for Gentoo-MetaEbuild-Spec-Base
  - configure: +2 -1 (recommends: +1)
  - develop: +48 -1 (recommends: -1, suggests: +1 ↑1)
  - runtime: +4 ↓1 -3
- - test: +2 -2 (recommends: +3)
+ - test: +3 -2 (recommends: +3)
 
  [Misc]
  - Report versions moved to Test::ReportVersions
diff --git a/META.json b/META.json
index bbfa361..bef07c3 100644
--- a/META.json
+++ b/META.json
@@ -112,7 +112,6 @@
             "File::Spec" : "0",
             "FindBin" : "0",
             "Test::Fatal" : "0",
-            "Test::File::ShareDir" : "0",
             "Test::File::ShareDir::Module" : "0",
             "Test::More" : "0.96"
          }
@@ -204,7 +203,6 @@
          "Test::CPAN::Changes" : "0.30",
          "Test::CPAN::Meta" : "0.23",
          "Test::Fatal" : "0.013",
-         "Test::File::ShareDir" : "1.000004",
          "Test::File::ShareDir::Module" : "1.000004",
          "Test::Kwalitee" : "1.19",
          "Test::More" : "1.001003",
diff --git a/META.yml b/META.yml
index 3538715..574f431 100644
--- a/META.yml
+++ b/META.yml
@@ -7,7 +7,6 @@ build_requires:
   File::Spec: '0'
   FindBin: '0'
   Test::Fatal: '0'
-  Test::File::ShareDir: '0'
   Test::File::ShareDir::Module: '0'
   Test::More: '0.96'
 configure_requires:
@@ -115,7 +114,6 @@ x_BuiltWith:
     Test::CPAN::Changes: '0.30'
     Test::CPAN::Meta: '0.23'
     Test::Fatal: '0.013'
-    Test::File::ShareDir: '1.000004'
     Test::File::ShareDir::Module: '1.000004'
     Test::Kwalitee: '1.19'
     Test::More: '1.001003'
diff --git a/Makefile.PL b/Makefile.PL
index 659ac17..f9dc7b1 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -48,7 +48,6 @@ my %WriteMakefileArgs = (
     "File::Spec" => 0,
     "FindBin" => 0,
     "Test::Fatal" => 0,
-    "Test::File::ShareDir" => 0,
     "Test::File::ShareDir::Module" => 0,
     "Test::More" => "0.96"
   },
@@ -76,7 +75,6 @@ my %FallbackPrereqs = (
   "Path::Tiny" => 0,
   "Scalar::Util" => 0,
   "Test::Fatal" => 0,
-  "Test::File::ShareDir" => 0,
   "Test::File::ShareDir::Module" => 0,
   "Test::More" => "0.96",
   "namespace::autoclean" => 0,
diff --git a/misc/Changes.deps b/misc/Changes.deps
index da6ab3e..3300f8f 100644
--- a/misc/Changes.deps
+++ b/misc/Changes.deps
@@ -14,6 +14,7 @@ This file contains changes in REQUIRED dependencies for standard CPAN phases (co
  [Added / test requires]
  - ExtUtils::MakeMaker
  - File::Spec
+ - Test::File::ShareDir::Module
 
  [Changed / runtime requires]
  - perl v5.10.0 → 5.008
diff --git a/misc/Changes.deps.all b/misc/Changes.deps.all
index 7b3dbfc..d2367a5 100644
--- a/misc/Changes.deps.all
+++ b/misc/Changes.deps.all
@@ -75,6 +75,7 @@ This file contains ALL changes in dependencies in both REQUIRED / OPTIONAL depen
  [Added / test requires]
  - ExtUtils::MakeMaker
  - File::Spec
+ - Test::File::ShareDir::Module
 
  [Changed / develop suggests]
  - Dist::Zilla::PluginBundle::Author::KENTNL v1.2.0 → 2.016007
diff --git a/t/00-report-prereqs.dd b/t/00-report-prereqs.dd
index e6fee81..7fcc75a 100644
--- a/t/00-report-prereqs.dd
+++ b/t/00-report-prereqs.dd
@@ -97,7 +97,6 @@ do { my $x = {
                                    'File::Spec' => '0',
                                    'FindBin' => '0',
                                    'Test::Fatal' => '0',
-                                   'Test::File::ShareDir' => '0',
                                    'Test::File::ShareDir::Module' => '0',
                                    'Test::More' => '0.96'
                                  }
diff --git a/t/04_fake_versions_object.t b/t/04_fake_versions_object.t
index 13bf53d..b57bc51 100644
--- a/t/04_fake_versions_object.t
+++ b/t/04_fake_versions_object.t
@@ -3,9 +3,10 @@ use warnings;
 
 use Test::More 0.96;
 use FindBin;
-use Test::File::ShareDir
-  -root  => "$FindBin::Bin/../",
-  -share => { -module => { 'Gentoo::MetaEbuild::Spec::Base' => 't/fake_spec' } };
+use Test::File::ShareDir::Module {
+  '-root'                          => "$FindBin::Bin/../",
+  'Gentoo::MetaEbuild::Spec::Base' => 't/fake_spec',
+};
 
 use Gentoo::MetaEbuild::Spec::Base;
 use version;