diff --git a/testsuite/tools/Makefile.am b/testsuite/tools/Makefile.am
index 6ccefc174d..ed7d98782e 100644
--- a/testsuite/tools/Makefile.am
+++ b/testsuite/tools/Makefile.am
@@ -14,7 +14,8 @@ test_simplify = \
 	$(NULL)
 
 EXTRA_DIST += \
-	$(test_simplify)
+	$(test_simplify)	\
+	$(NULL)
 
 TESTS_ENVIRONMENT = \
 	GTK_BUILDER_TOOL="$(top_builddir)/gtk/gtk-builder-tool"
@@ -23,4 +24,25 @@ TEST_PROGS += \
 	test-simplify	\
 	$(NULL)
 
+if BUILDOPT_INSTALL_TESTS
+insttestdir = $(libexecdir)/installed-tests/$(PACKAGE)
+insttest_SCRIPTS = $(TEST_PROGS)
+nobase_insttest_DATA = $(test_simplify)
+
+test-simplify.test: test-simplify Makefile
+	$(AM_V_GEN) (echo '[Test]' > $@.tmp; \
+	echo 'Type=session' >> $@.tmp; \
+	echo 'Exec env G_ENABLE_DIAGNOSTIC=0 TEST_DATA_DIR="$(insttestdir)/simplify" $(insttestdir)/$<' >> $@.tmp; \
+	mv $@.tmp $@)
+
+test_files = $(TEST_PROGS:=.test)
+
+DISTCLEANFILES = \
+	$(test_files)		\
+	$(NULL)
+
+testmetadir = #(datadir)/installed-tests/$(PACKAGE)
+testmeta_DATA = $(test_files)
+endif
+
 -include $(top_srcdir)/git.mk