diff --git a/Build.PL b/Build.PL
index 71006d6..c95dfe6 100644
--- a/Build.PL
+++ b/Build.PL
@@ -43,6 +43,8 @@ my $builder = Module::Build->new(
               'http://github.com/schwern/perl5i/issues',
         },
     },
+
+    recursive_test_files => 1,
 );
 
 $builder->create_build_script();
diff --git a/MANIFEST b/MANIFEST
index e88e790..a260345 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -8,19 +8,20 @@ t/autobox.t
 t/autodie.t
 t/CLASS.t
 t/datetime.t
+t/dump/array.t
+t/dump/hash.t
+t/dump/scalar.t
 t/File-stat.t
 t/lexical.t
+t/List-Util/first.t
+t/List-Util/max.t
+t/List-Util/maxstr.t
+t/List-Util/min.t
+t/List-Util/minstr.t
+t/List-Util/reduce.t
+t/List-Util/shuffle.t
+t/List-Util/sum.t
 t/modern_perl.t
 t/Module-Load.t
-t/autobox_scalar_dump.t
-t/autobox_array_dump.t
-t/autobox_hash_dump.t
+t/time_compat.t
 t/y2038.t
-t/first.t
-t/max.t
-t/maxstr.t
-t/min.t
-t/minstr.t
-t/reduce.t
-t/shuffle.t
-t/sum.t
diff --git a/t/first.t b/t/List-Util/first.t
similarity index 100%
rename from t/first.t
rename to t/List-Util/first.t
diff --git a/t/max.t b/t/List-Util/max.t
similarity index 100%
rename from t/max.t
rename to t/List-Util/max.t
diff --git a/t/maxstr.t b/t/List-Util/maxstr.t
similarity index 100%
rename from t/maxstr.t
rename to t/List-Util/maxstr.t
diff --git a/t/min.t b/t/List-Util/min.t
similarity index 100%
rename from t/min.t
rename to t/List-Util/min.t
diff --git a/t/minstr.t b/t/List-Util/minstr.t
similarity index 100%
rename from t/minstr.t
rename to t/List-Util/minstr.t
diff --git a/t/reduce.t b/t/List-Util/reduce.t
similarity index 100%
rename from t/reduce.t
rename to t/List-Util/reduce.t
diff --git a/t/shuffle.t b/t/List-Util/shuffle.t
similarity index 100%
rename from t/shuffle.t
rename to t/List-Util/shuffle.t
diff --git a/t/sum.t b/t/List-Util/sum.t
similarity index 100%
rename from t/sum.t
rename to t/List-Util/sum.t
diff --git a/t/autobox_array_dump.t b/t/dump/array.t
similarity index 100%
rename from t/autobox_array_dump.t
rename to t/dump/array.t
diff --git a/t/autobox_hash_dump.t b/t/dump/hash.t
similarity index 100%
rename from t/autobox_hash_dump.t
rename to t/dump/hash.t
diff --git a/t/autobox_scalar_dump.t b/t/dump/scalar.t
similarity index 100%
rename from t/autobox_scalar_dump.t
rename to t/dump/scalar.t