diff --git a/Build.PL b/Build.PL
index e5d11c0..255bc5e 100644
--- a/Build.PL
+++ b/Build.PL
@@ -53,6 +53,10 @@ my $build = Module::Build->new(
     configure_requires => {
         'Module::Build' => 0,
     },
+    build_requires => {
+        'Test::More'   => 0,
+        'Test::Output' => 0,
+    },
 );
 
 $build->create_build_script();
diff --git a/META.json b/META.json
index c622c81..637c9f1 100644
--- a/META.json
+++ b/META.json
@@ -14,6 +14,12 @@
    },
    "name" : "Stow",
    "prereqs" : {
+      "build" : {
+         "requires" : {
+            "Test::More" : 0,
+            "Test::Output" : 0
+         }
+      },
       "configure" : {
          "requires" : {
             "Module::Build" : 0
diff --git a/META.yml b/META.yml
index d1d2748..f09bef9 100644
--- a/META.yml
+++ b/META.yml
@@ -2,7 +2,9 @@
 abstract: 'manage the installation of multiple software packages'
 author:
   - unknown
-build_requires: {}
+build_requires:
+  Test::More: 0
+  Test::Output: 0
 configure_requires:
   Module::Build: 0
 dynamic_config: 1
diff --git a/TODO b/TODO
index b873238..b15186f 100644
--- a/TODO
+++ b/TODO
@@ -22,8 +22,6 @@
 * Add semi-automatic conflict resolution
 *** STOW_RESOLVE_CONFLICTS="non_stow_symlinks=t stow_symlinks=r"
 *** Add documentation about conflict resolution
-* Make CPAN-friendly via Module::Build
-*** Include test-time dependencies on Test::More and Test::Output
 * get account on fencepost.gnu.org (email accounts@gnu.org) 
   set up copyright papers? 
   'assign.future' and 'request-assign.future.manual'