diff --git a/MANIFEST b/MANIFEST
index b908babaab..c38d95833f 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -4232,19 +4232,19 @@ dist/ExtUtils-ParseXS/t/515-typemaps-cmd.t			ExtUtils::Typemaps tests
 dist/ExtUtils-ParseXS/t/516-typemaps-clone.t			ExtUtils::Typemaps tests
 dist/ExtUtils-ParseXS/t/517-typemaps-targetable.t		ExtUtils::Typemaps tests
 dist/ExtUtils-ParseXS/t/518-typemaps-compat.t			ExtUtils::Typemaps tests
-dist/ExtUtils-ParseXS/t/data/b.typemap				ExtUtils::Typemaps test data
-dist/ExtUtils-ParseXS/t/data/combined.typemap			ExtUtils::Typemaps test data
-dist/ExtUtils-ParseXS/t/data/confl_repl.typemap			ExtUtils::Typemaps test data
-dist/ExtUtils-ParseXS/t/data/confl_skip.typemap			ExtUtils::Typemaps test data
-dist/ExtUtils-ParseXS/t/data/conflicting.typemap		ExtUtils::Typemaps test data
-dist/ExtUtils-ParseXS/t/data/other.typemap			ExtUtils::Typemaps test data
-dist/ExtUtils-ParseXS/t/data/perl.typemap			ExtUtils::Typemaps test data
-dist/ExtUtils-ParseXS/t/data/simple.typemap			ExtUtils::Typemaps test data
 dist/ExtUtils-ParseXS/t/lib/ExtUtils/Typemaps/Test.pm		ExtUtils::Typemaps tests
 dist/ExtUtils-ParseXS/t/lib/IncludeTester.pm			ExtUtils::ParseXS testing utility
 dist/ExtUtils-ParseXS/t/lib/PrimitiveCapture.pm			Primitive STDOUT/ERR capturing for tests
 dist/ExtUtils-ParseXS/t/lib/TestMany.pm				Tool for running XS parser tests
 dist/ExtUtils-ParseXS/t/lib/TypemapTest/Foo.pm			ExtUtils::Typemaps tests
+dist/ExtUtils-ParseXS/t/test_typemaps/b.typemap			ExtUtils::Typemaps test data
+dist/ExtUtils-ParseXS/t/test_typemaps/combined.typemap		ExtUtils::Typemaps test data
+dist/ExtUtils-ParseXS/t/test_typemaps/confl_repl.typemap	ExtUtils::Typemaps test data
+dist/ExtUtils-ParseXS/t/test_typemaps/confl_skip.typemap	ExtUtils::Typemaps test data
+dist/ExtUtils-ParseXS/t/test_typemaps/conflicting.typemap	ExtUtils::Typemaps test data
+dist/ExtUtils-ParseXS/t/test_typemaps/other.typemap		ExtUtils::Typemaps test data
+dist/ExtUtils-ParseXS/t/test_typemaps/perl.typemap		ExtUtils::Typemaps test data
+dist/ExtUtils-ParseXS/t/test_typemaps/simple.typemap		ExtUtils::Typemaps test data
 dist/ExtUtils-ParseXS/t/typemap					Standard typemap for controlled testing
 dist/ExtUtils-ParseXS/t/XSInclude.xsh				Test file for ExtUtils::ParseXS tests
 dist/ExtUtils-ParseXS/t/XSloop.xsh				Test file for ExtUtils::ParseXS tests
diff --git a/dist/ExtUtils-ParseXS/t/106-api-process_typemaps.t b/dist/ExtUtils-ParseXS/t/106-api-process_typemaps.t
index 90ab281573..23afaccbc7 100644
--- a/dist/ExtUtils-ParseXS/t/106-api-process_typemaps.t
+++ b/dist/ExtUtils-ParseXS/t/106-api-process_typemaps.t
@@ -50,7 +50,7 @@ my $startdir  = cwd();
 
 {
     my $tm_obj = process_typemaps(
-        [ File::Spec->catfile("t", "data", "conflicting.typemap") ], '.');
+        [ File::Spec->catfile("t", "test_typemaps", "conflicting.typemap") ], '.');
     ok($tm_obj, "got typemap object");
 
     my $tm_entry = $tm_obj->get_typemap(ctype => 'double');
diff --git a/dist/ExtUtils-ParseXS/t/512-typemaps-file.t b/dist/ExtUtils-ParseXS/t/512-typemaps-file.t
index 22548d3a76..417f77eb8e 100644
--- a/dist/ExtUtils-ParseXS/t/512-typemaps-file.t
+++ b/dist/ExtUtils-ParseXS/t/512-typemaps-file.t
@@ -11,7 +11,8 @@ use ExtUtils::Typemaps;
 use File::Spec;
 use File::Temp;
 
-my $datadir = -d 't' ? File::Spec->catdir(qw/t data/) : 'data';
+my $datadir = -d 't' ? File::Spec->catdir(qw/t test_typemaps/)
+                     : 'test_typemaps';
 
 sub slurp {
   my $file = shift;
diff --git a/dist/ExtUtils-ParseXS/t/513-typemaps-merge.t b/dist/ExtUtils-ParseXS/t/513-typemaps-merge.t
index 760768292e..546b97318a 100644
--- a/dist/ExtUtils-ParseXS/t/513-typemaps-merge.t
+++ b/dist/ExtUtils-ParseXS/t/513-typemaps-merge.t
@@ -10,7 +10,8 @@ use ExtUtils::Typemaps;
 use File::Spec;
 use File::Temp;
 
-my $datadir = -d 't' ? File::Spec->catdir(qw/t data/) : 'data';
+my $datadir = -d 't' ? File::Spec->catdir(qw/t test_typemaps/)
+                     : 'test_typemaps';
 
 sub slurp {
   my $file = shift;
diff --git a/dist/ExtUtils-ParseXS/t/515-typemaps-cmd.t b/dist/ExtUtils-ParseXS/t/515-typemaps-cmd.t
index a02da61416..c811cafd98 100644
--- a/dist/ExtUtils-ParseXS/t/515-typemaps-cmd.t
+++ b/dist/ExtUtils-ParseXS/t/515-typemaps-cmd.t
@@ -11,7 +11,8 @@ use Test::More tests => 6;
 use File::Spec;
 use ExtUtils::Typemaps::Cmd;
 
-my $datadir = -d 't' ? File::Spec->catdir(qw/t data/) : 'data';
+my $datadir = -d 't' ? File::Spec->catdir(qw/t test_typemaps/)
+                     : 'test_typemaps';
 my $libdir = -d 't' ? File::Spec->catdir(qw/t lib/) : 'lib';
 
 unshift @INC, $libdir;
diff --git a/dist/ExtUtils-ParseXS/t/518-typemaps-compat.t b/dist/ExtUtils-ParseXS/t/518-typemaps-compat.t
index d0ac26f0ff..4cb0f2e1b5 100644
--- a/dist/ExtUtils-ParseXS/t/518-typemaps-compat.t
+++ b/dist/ExtUtils-ParseXS/t/518-typemaps-compat.t
@@ -20,7 +20,8 @@ use ExtUtils::ParseXS::Utilities qw(
 use ExtUtils::ParseXS::Constants;
 use File::Spec;
 
-my $path_prefix = File::Spec->catdir(-d 't' ? qw(t data) : qw(data));
+my $path_prefix = File::Spec->catdir(-d 't' ? qw(t test_typemaps)
+                                            : qw(test_typemaps));
 
 my @tests = (
   {
diff --git a/dist/ExtUtils-ParseXS/t/data/b.typemap b/dist/ExtUtils-ParseXS/t/test_typemaps/b.typemap
similarity index 100%
rename from dist/ExtUtils-ParseXS/t/data/b.typemap
rename to dist/ExtUtils-ParseXS/t/test_typemaps/b.typemap
diff --git a/dist/ExtUtils-ParseXS/t/data/combined.typemap b/dist/ExtUtils-ParseXS/t/test_typemaps/combined.typemap
similarity index 100%
rename from dist/ExtUtils-ParseXS/t/data/combined.typemap
rename to dist/ExtUtils-ParseXS/t/test_typemaps/combined.typemap
diff --git a/dist/ExtUtils-ParseXS/t/data/confl_repl.typemap b/dist/ExtUtils-ParseXS/t/test_typemaps/confl_repl.typemap
similarity index 100%
rename from dist/ExtUtils-ParseXS/t/data/confl_repl.typemap
rename to dist/ExtUtils-ParseXS/t/test_typemaps/confl_repl.typemap
diff --git a/dist/ExtUtils-ParseXS/t/data/confl_skip.typemap b/dist/ExtUtils-ParseXS/t/test_typemaps/confl_skip.typemap
similarity index 100%
rename from dist/ExtUtils-ParseXS/t/data/confl_skip.typemap
rename to dist/ExtUtils-ParseXS/t/test_typemaps/confl_skip.typemap
diff --git a/dist/ExtUtils-ParseXS/t/data/conflicting.typemap b/dist/ExtUtils-ParseXS/t/test_typemaps/conflicting.typemap
similarity index 100%
rename from dist/ExtUtils-ParseXS/t/data/conflicting.typemap
rename to dist/ExtUtils-ParseXS/t/test_typemaps/conflicting.typemap
diff --git a/dist/ExtUtils-ParseXS/t/data/other.typemap b/dist/ExtUtils-ParseXS/t/test_typemaps/other.typemap
similarity index 100%
rename from dist/ExtUtils-ParseXS/t/data/other.typemap
rename to dist/ExtUtils-ParseXS/t/test_typemaps/other.typemap
diff --git a/dist/ExtUtils-ParseXS/t/data/perl.typemap b/dist/ExtUtils-ParseXS/t/test_typemaps/perl.typemap
similarity index 100%
rename from dist/ExtUtils-ParseXS/t/data/perl.typemap
rename to dist/ExtUtils-ParseXS/t/test_typemaps/perl.typemap
diff --git a/dist/ExtUtils-ParseXS/t/data/simple.typemap b/dist/ExtUtils-ParseXS/t/test_typemaps/simple.typemap
similarity index 100%
rename from dist/ExtUtils-ParseXS/t/data/simple.typemap
rename to dist/ExtUtils-ParseXS/t/test_typemaps/simple.typemap