diff --git a/configure.ac b/configure.ac
index 3b68264ee..0b7e590cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -494,6 +494,9 @@ test/Makefile
 test/api/Makefile
 test/fuzzing/Makefile
 test/shaping/Makefile
+test/shaping/data/Makefile
+test/shaping/data/in-house/Makefile
+test/shaping/data/text-rendering-tests/Makefile
 docs/Makefile
 docs/version.xml
 ])
diff --git a/test/shaping/Makefile.am b/test/shaping/Makefile.am
index 0cd4503d4..732033650 100644
--- a/test/shaping/Makefile.am
+++ b/test/shaping/Makefile.am
@@ -3,8 +3,7 @@
 NULL =
 EXTRA_DIST =
 CLEANFILES =
-DISTCLEANFILES =
-MAINTAINERCLEANFILES =
+SUBDIRS = data
 
 # Convenience targets:
 lib:
@@ -23,10 +22,6 @@ EXTRA_DIST += \
 	record-test.sh \
 	run-tests.py \
 	texts/in-house \
-	data/in-house/fonts \
-	data/text-rendering-tests/extract-tests.py \
-	data/text-rendering-tests/fonts \
-	$(TESTS) \
 	$(NULL)
 
 # TODO Figure out Python stuff
@@ -37,95 +32,4 @@ CLEANFILES += \
 	hb_test_tools.py[co] \
 	$(NULL)
 
-TESTS = \
-	data/in-house/tests/arabic-fallback-shaping.tests \
-	data/in-house/tests/arabic-feature-order.tests \
-	data/in-house/tests/arabic-like-joining.tests \
-	data/in-house/tests/arabic-mark-order.tests \
-	data/in-house/tests/arabic-stch.tests \
-	data/in-house/tests/automatic-fractions.tests \
-	data/in-house/tests/cluster.tests \
-	data/in-house/tests/color-fonts.tests \
-	data/in-house/tests/context-matching.tests \
-	data/in-house/tests/cursive-positioning.tests \
-	data/in-house/tests/default-ignorables.tests \
-	data/in-house/tests/emoji-flag-tags.tests \
-	data/in-house/tests/fallback-positioning.tests \
-	data/in-house/tests/fuzzed.tests \
-	data/in-house/tests/hangul-jamo.tests \
-	data/in-house/tests/hyphens.tests \
-	data/in-house/tests/indic-consonant-with-stacker.tests \
-	data/in-house/tests/indic-init.tests \
-	data/in-house/tests/indic-joiner-candrabindu.tests \
-	data/in-house/tests/indic-joiners.tests \
-	data/in-house/tests/indic-old-spec.tests \
-	data/in-house/tests/indic-pref-blocking.tests \
-	data/in-house/tests/indic-script-extensions.tests \
-	data/in-house/tests/indic-special-cases.tests \
-	data/in-house/tests/indic-syllable.tests \
-	data/in-house/tests/language-tags.tests \
-	data/in-house/tests/ligature-id.tests \
-	data/in-house/tests/mark-attachment.tests \
-	data/in-house/tests/mark-filtering-sets.tests \
-	data/in-house/tests/mongolian-variation-selector.tests \
-	data/in-house/tests/spaces.tests \
-	data/in-house/tests/simple.tests \
-	data/in-house/tests/tibetan-contractions-1.tests \
-	data/in-house/tests/tibetan-contractions-2.tests \
-	data/in-house/tests/tibetan-vowels.tests \
-	data/in-house/tests/use.tests \
-	data/in-house/tests/use-marchen.tests \
-	data/in-house/tests/use-syllable.tests \
-	data/in-house/tests/variations-rvrn.tests \
-	data/in-house/tests/vertical.tests \
-	data/in-house/tests/zero-width-marks.tests \
-	data/text-rendering-tests/tests/AVAR-1.tests \
-	data/text-rendering-tests/tests/CFF-1.tests \
-	data/text-rendering-tests/tests/CFF2-1.tests \
-	data/text-rendering-tests/tests/CFF-2.tests \
-	data/text-rendering-tests/tests/CMAP-1.tests \
-	data/text-rendering-tests/tests/CMAP-2.tests \
-	data/text-rendering-tests/tests/CVAR-1.tests \
-	data/text-rendering-tests/tests/CVAR-2.tests \
-	data/text-rendering-tests/tests/GLYF-1.tests \
-	data/text-rendering-tests/tests/GPOS-1.tests \
-	data/text-rendering-tests/tests/GPOS-2.tests \
-	data/text-rendering-tests/tests/GPOS-3.tests \
-	data/text-rendering-tests/tests/GPOS-4.tests \
-	data/text-rendering-tests/tests/GPOS-5.tests \
-	data/text-rendering-tests/tests/GSUB-1.tests \
-	data/text-rendering-tests/tests/GSUB-2.tests \
-	data/text-rendering-tests/tests/GVAR-1.tests \
-	data/text-rendering-tests/tests/GVAR-2.tests \
-	data/text-rendering-tests/tests/GVAR-3.tests \
-	data/text-rendering-tests/tests/GVAR-4.tests \
-	data/text-rendering-tests/tests/GVAR-5.tests \
-	data/text-rendering-tests/tests/GVAR-6.tests \
-	data/text-rendering-tests/tests/GVAR-7.tests \
-	data/text-rendering-tests/tests/GVAR-8.tests \
-	data/text-rendering-tests/tests/GVAR-9.tests \
-	data/text-rendering-tests/tests/HVAR-1.tests \
-	data/text-rendering-tests/tests/HVAR-2.tests \
-	data/text-rendering-tests/tests/KERN-1.tests \
-	data/text-rendering-tests/tests/KERN-2.tests \
-	data/text-rendering-tests/tests/SHBALI-3.tests \
-	data/text-rendering-tests/tests/SHKNDA-1.tests \
-	$(NULL)
-
-DISABLED_TESTS = \
-	data/text-rendering-tests/tests/CMAP-3.tests # Non-Unicode cmap \
-	data/text-rendering-tests/tests/MORX-1.tests # Not implemented \
-	data/text-rendering-tests/tests/MORX-2.tests # Not implemented \
-	data/text-rendering-tests/tests/MORX-3.tests # Not implemented \
-	data/text-rendering-tests/tests/MORX-4.tests # Not implemented \
-	data/text-rendering-tests/tests/SHARAN-1.tests # Rounding difference \
-	data/text-rendering-tests/tests/SHBALI-1.tests # Rounding difference \
-	data/text-rendering-tests/tests/SHBALI-2.tests # Rounding difference \
-	data/text-rendering-tests/tests/SHKNDA-2.tests # Rounding difference \
-	data/text-rendering-tests/tests/SHKNDA-3.tests # Rounding difference \
-	$(NULL)
-
-TEST_EXTENSIONS = .tests
-TESTS_LOG_COMPILER = $(srcdir)/run-tests.py $(top_builddir)/util/hb-shape$(EXEEXT)
-
 -include $(top_srcdir)/git.mk
diff --git a/test/shaping/data/Makefile.am b/test/shaping/data/Makefile.am
new file mode 100644
index 000000000..e76b3b870
--- /dev/null
+++ b/test/shaping/data/Makefile.am
@@ -0,0 +1,9 @@
+# Process this file with automake to produce Makefile.in
+
+NULL =
+SUBDIRS = \
+	in-house \
+	text-rendering-tests \
+	$(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/test/shaping/data/in-house/Makefile.am b/test/shaping/data/in-house/Makefile.am
new file mode 100644
index 000000000..a9893a89a
--- /dev/null
+++ b/test/shaping/data/in-house/Makefile.am
@@ -0,0 +1,58 @@
+# Process this file with automake to produce Makefile.in
+
+NULL =
+
+EXTRA_DIST = \
+	COPYING \
+	fonts \
+	$(TESTS) \
+	$(NULL)
+
+TEST_EXTENSIONS = .tests
+TESTS_LOG_COMPILER = $(srcdir)/../../run-tests.py $(top_builddir)/util/hb-shape$(EXEEXT)
+
+TESTS = \
+	tests/arabic-fallback-shaping.tests \
+	tests/arabic-feature-order.tests \
+	tests/arabic-like-joining.tests \
+	tests/arabic-mark-order.tests \
+	tests/arabic-stch.tests \
+	tests/automatic-fractions.tests \
+	tests/cluster.tests \
+	tests/color-fonts.tests \
+	tests/context-matching.tests \
+	tests/cursive-positioning.tests \
+	tests/default-ignorables.tests \
+	tests/emoji-flag-tags.tests \
+	tests/fallback-positioning.tests \
+	tests/fuzzed.tests \
+	tests/hangul-jamo.tests \
+	tests/hyphens.tests \
+	tests/indic-consonant-with-stacker.tests \
+	tests/indic-init.tests \
+	tests/indic-joiner-candrabindu.tests \
+	tests/indic-joiners.tests \
+	tests/indic-old-spec.tests \
+	tests/indic-pref-blocking.tests \
+	tests/indic-script-extensions.tests \
+	tests/indic-special-cases.tests \
+	tests/indic-syllable.tests \
+	tests/language-tags.tests \
+	tests/ligature-id.tests \
+	tests/mark-attachment.tests \
+	tests/mark-filtering-sets.tests \
+	tests/mongolian-variation-selector.tests \
+	tests/spaces.tests \
+	tests/simple.tests \
+	tests/tibetan-contractions-1.tests \
+	tests/tibetan-contractions-2.tests \
+	tests/tibetan-vowels.tests \
+	tests/use.tests \
+	tests/use-marchen.tests \
+	tests/use-syllable.tests \
+	tests/variations-rvrn.tests \
+	tests/vertical.tests \
+	tests/zero-width-marks.tests \
+	$(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/test/shaping/data/text-rendering-tests/Makefile.am b/test/shaping/data/text-rendering-tests/Makefile.am
new file mode 100644
index 000000000..2798e512c
--- /dev/null
+++ b/test/shaping/data/text-rendering-tests/Makefile.am
@@ -0,0 +1,60 @@
+# Process this file with automake to produce Makefile.in
+
+NULL =
+
+EXTRA_DIST = \
+	extract-tests.py \
+	fonts \
+	$(TESTS) \
+	$(NULL)
+
+TEST_EXTENSIONS = .tests
+TESTS_LOG_COMPILER = $(srcdir)/../../run-tests.py $(top_builddir)/util/hb-shape$(EXEEXT)
+
+TESTS = \
+	tests/AVAR-1.tests \
+	tests/CFF-1.tests \
+	tests/CFF2-1.tests \
+	tests/CFF-2.tests \
+	tests/CMAP-1.tests \
+	tests/CMAP-2.tests \
+	tests/CVAR-1.tests \
+	tests/CVAR-2.tests \
+	tests/GLYF-1.tests \
+	tests/GPOS-1.tests \
+	tests/GPOS-2.tests \
+	tests/GPOS-3.tests \
+	tests/GPOS-4.tests \
+	tests/GPOS-5.tests \
+	tests/GSUB-1.tests \
+	tests/GSUB-2.tests \
+	tests/GVAR-1.tests \
+	tests/GVAR-2.tests \
+	tests/GVAR-3.tests \
+	tests/GVAR-4.tests \
+	tests/GVAR-5.tests \
+	tests/GVAR-6.tests \
+	tests/GVAR-7.tests \
+	tests/GVAR-8.tests \
+	tests/GVAR-9.tests \
+	tests/HVAR-1.tests \
+	tests/HVAR-2.tests \
+	tests/KERN-1.tests \
+	tests/KERN-2.tests \
+	tests/SHBALI-3.tests \
+	tests/SHKNDA-1.tests \
+	$(NULL)
+DISABLED_TESTS = \
+	tests/CMAP-3.tests # Non-Unicode cmap \
+	tests/MORX-1.tests # Not implemented \
+	tests/MORX-2.tests # Not implemented \
+	tests/MORX-3.tests # Not implemented \
+	tests/MORX-4.tests # Not implemented \
+	tests/SHARAN-1.tests # Rounding difference \
+	tests/SHBALI-1.tests # Rounding difference \
+	tests/SHBALI-2.tests # Rounding difference \
+	tests/SHKNDA-2.tests # Rounding difference \
+	tests/SHKNDA-3.tests # Rounding difference \
+	$(NULL)
+
+-include $(top_srcdir)/git.mk