diff --git a/gdk/tests/Makefile.am b/gdk/tests/Makefile.am
index 49a7dca6ca..bd9a3b392f 100644
--- a/gdk/tests/Makefile.am
+++ b/gdk/tests/Makefile.am
@@ -39,4 +39,30 @@ CLEANFILES = \
 	cairosurface.png	\
 	gdksurface.png
 
+if BUILDOPT_INSTALL_TESTS
+insttestdir=$(pkglibexecdir)/installed-tests
+insttest_PROGRAMS = $(TEST_PROGS)
+
+substitutions = \
+	-e s,@pkglibexecdir\@,$(pkglibexecdir),g \
+	$(NULL)
+
+test_in_files = \
+	rgba.test.in \
+	encoding.test.in \
+	display.test.in \
+	keysyms.test.in \
+	$(NULL)
+
+test_files = $(test_in_files:.test.in=.test)
+
+$(test_files): %.test: %.test.in
+	$(AM_V_GEN) sed $(substitutions) $< > $@.tmp && mv $@.tmp $@
+
+EXTRA_DIST += $(test_in_files)
+
+testmetadir = $(datadir)/installed-tests/$(PACKAGE)
+testmeta_DATA = $(test_files)
+endif
+
 -include $(top_srcdir)/git.mk
diff --git a/gdk/tests/display.test.in b/gdk/tests/display.test.in
new file mode 100644
index 0000000000..9875c68ca3
--- /dev/null
+++ b/gdk/tests/display.test.in
@@ -0,0 +1,3 @@
+[Test]
+Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/display"
+Type=session
diff --git a/gdk/tests/encoding.test.in b/gdk/tests/encoding.test.in
new file mode 100644
index 0000000000..06a329db68
--- /dev/null
+++ b/gdk/tests/encoding.test.in
@@ -0,0 +1,3 @@
+[Test]
+Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/encoding"
+Type=session
diff --git a/gdk/tests/keysyms.test.in b/gdk/tests/keysyms.test.in
new file mode 100644
index 0000000000..2f1ce97583
--- /dev/null
+++ b/gdk/tests/keysyms.test.in
@@ -0,0 +1,3 @@
+[Test]
+Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/keysyms"
+Type=session
diff --git a/gdk/tests/rgba.test.in b/gdk/tests/rgba.test.in
new file mode 100644
index 0000000000..5fd3155fae
--- /dev/null
+++ b/gdk/tests/rgba.test.in
@@ -0,0 +1,3 @@
+[Test]
+Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/rgba"
+Type=session