Configure automake to run the new subset tests.
diff --git a/configure.ac b/configure.ac
index dec994e..12401f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -500,6 +500,8 @@
test/shaping/data/Makefile
test/shaping/data/in-house/Makefile
test/shaping/data/text-rendering-tests/Makefile
+test/subset/Makefile
+test/subset/data/Makefile
docs/Makefile
docs/version.xml
])
diff --git a/test/Makefile.am b/test/Makefile.am
index ad496f5..66b3e6e 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -2,7 +2,7 @@
NULL =
EXTRA_DIST =
-SUBDIRS = api shaping fuzzing
+SUBDIRS = api shaping fuzzing subset
EXTRA_DIST += \
CMakeLists.txt \
diff --git a/test/subset/Makefile.am b/test/subset/Makefile.am
new file mode 100644
index 0000000..3037261
--- /dev/null
+++ b/test/subset/Makefile.am
@@ -0,0 +1,16 @@
+# Process this file with automake to produce Makefile.in
+
+NULL =
+EXTRA_DIST =
+CLEANFILES =
+SUBDIRS = data
+
+# Convenience targets:
+lib:
+ @$(MAKE) $(AM_MAKEFLAGS) -C $(top_builddir)/src lib
+
+CLEANFILES += \
+ subset_test_suite.py[c0] \
+ $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/test/subset/data/Makefile.am b/test/subset/data/Makefile.am
new file mode 100644
index 0000000..c74f7fd
--- /dev/null
+++ b/test/subset/data/Makefile.am
@@ -0,0 +1,16 @@
+# Process this file with automake to produce Makefile.in
+
+NULL =
+EXTRA_DIST =
+CLEANFILES =
+SUBDIRS =
+
+# Convenience targets:
+lib:
+ @$(MAKE) $(AM_MAKEFLAGS) -C $(top_builddir)/src lib
+
+TEST_EXTENSIONS = .tests
+TESTS_LOG_COMPILER = $(srcdir)/../run-tests.py $(top_builddir)/util/hb-subset$(EXEEXT)
+include Makefile.sources
+
+-include $(top_srcdir)/git.mk
diff --git a/test/subset/data/Makefile.sources b/test/subset/data/Makefile.sources
new file mode 100644
index 0000000..574f946
--- /dev/null
+++ b/test/subset/data/Makefile.sources
@@ -0,0 +1,10 @@
+TESTS = \
+ tests/basics.tests \
+ $(NULL)
+
+XFAIL_TESTS = \
+ tests/basics.tests \
+ $(NULL)
+
+DISABLED_TESTS = \
+ $(NULL)
diff --git a/test/subset/data/tests/basics.txt b/test/subset/data/tests/basics.tests
similarity index 100%
rename from test/subset/data/tests/basics.txt
rename to test/subset/data/tests/basics.tests
