diff --git a/testsuite/a11y/a11ychildren.test.in b/testsuite/a11y/a11ychildren.test.in
index 91ee1c2e66..04475922fe 100644
--- a/testsuite/a11y/a11ychildren.test.in
+++ b/testsuite/a11y/a11ychildren.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/children"
+Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/children --tap"
 Type=session
-
+Output=TAP
diff --git a/testsuite/a11y/a11ymisc.test.in b/testsuite/a11y/a11ymisc.test.in
index 9de0253255..0cbe27342b 100644
--- a/testsuite/a11y/a11ymisc.test.in
+++ b/testsuite/a11y/a11ymisc.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/misc"
+Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/misc --tap"
 Type=session
-
+Output=TAP
diff --git a/testsuite/a11y/a11ytext.test.in b/testsuite/a11y/a11ytext.test.in
index fb2db7de17..9a9c597fd9 100644
--- a/testsuite/a11y/a11ytext.test.in
+++ b/testsuite/a11y/a11ytext.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/text"
+Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/text --tap"
 Type=session
-
+Output=TAP
diff --git a/testsuite/a11y/a11ytree.test.in b/testsuite/a11y/a11ytree.test.in
index a21b61a47f..081438d4de 100644
--- a/testsuite/a11y/a11ytree.test.in
+++ b/testsuite/a11y/a11ytree.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/tree-relationships"
+Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/tree-relationships --tap"
 Type=session
-
+Output=TAP
diff --git a/testsuite/a11y/a11yutil.test.in b/testsuite/a11y/a11yutil.test.in
index ee1f654601..fa6cc0bc91 100644
--- a/testsuite/a11y/a11yutil.test.in
+++ b/testsuite/a11y/a11yutil.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/util"
+Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/util --tap"
 Type=session
-
+Output=TAP
diff --git a/testsuite/a11y/a11yvalue.test.in b/testsuite/a11y/a11yvalue.test.in
index deb7960ff1..70334ac48d 100644
--- a/testsuite/a11y/a11yvalue.test.in
+++ b/testsuite/a11y/a11yvalue.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/value"
+Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/value --tap"
 Type=session
-
+Output=TAP
diff --git a/testsuite/a11y/state/Makefile.am b/testsuite/a11y/state/Makefile.am
index 9d43ce917b..cb9546d121 100644
--- a/testsuite/a11y/state/Makefile.am
+++ b/testsuite/a11y/state/Makefile.am
@@ -40,7 +40,8 @@ statetest_DATA = $(testdata)
 a11ystate.test: Makefile
 	$(AM_V_GEN) (echo '[Test]' > $@.tmp; \
 	echo 'Type=session-exclusive' >> $@.tmp; \
-	echo 'Exec=env G_ENABLE_DIAGNOSTIC=0 $(insttestdir)/state-record --directory $(statetestdir)' >> $@.tmp; \
+	echo 'Output=TAP' >> $@.tmp; \
+	echo 'Exec=env G_ENABLE_DIAGNOSTIC=0 $(insttestdir)/state-record --tap --directory $(statetestdir)' >> $@.tmp; \
 	mv $@.tmp $@)
 
 testfiles = a11ystate.test
diff --git a/testsuite/css/nodes/test-css-nodes.test.in b/testsuite/css/nodes/test-css-nodes.test.in
index 611e201189..98c1cc1962 100644
--- a/testsuite/css/nodes/test-css-nodes.test.in
+++ b/testsuite/css/nodes/test-css-nodes.test.in
@@ -1,3 +1,4 @@
 [Test]
-Exec=/bin/sh -c "cd @libexecdir@/installed-tests/gtk+/css/nodes && @libexecdir@/installed-tests/gtk+/css/nodes/test-css-nodes"
+Exec=/bin/sh -c "cd @libexecdir@/installed-tests/gtk+/css/nodes && @libexecdir@/installed-tests/gtk+/css/nodes/test-css-nodes --tap"
 Type=session
+Output=TAP
diff --git a/testsuite/css/parser/test-css-parser.test.in b/testsuite/css/parser/test-css-parser.test.in
index 91fd581cbe..132944d10d 100644
--- a/testsuite/css/parser/test-css-parser.test.in
+++ b/testsuite/css/parser/test-css-parser.test.in
@@ -1,3 +1,4 @@
 [Test]
-Exec=/bin/sh -c "cd @libexecdir@/installed-tests/gtk+/css/parser && @libexecdir@/installed-tests/gtk+/css/parser/test-css-parser"
+Exec=/bin/sh -c "cd @libexecdir@/installed-tests/gtk+/css/parser && @libexecdir@/installed-tests/gtk+/css/parser/test-css-parser --tap"
 Type=session
+Output=TAP
diff --git a/testsuite/css/style/test-css-style.test.in b/testsuite/css/style/test-css-style.test.in
index 6d00d8d542..c36aa00635 100644
--- a/testsuite/css/style/test-css-style.test.in
+++ b/testsuite/css/style/test-css-style.test.in
@@ -1,3 +1,4 @@
 [Test]
-Exec=/bin/sh -c "cd @libexecdir@/installed-tests/gtk+/css/style && @libexecdir@/installed-tests/gtk+/css/style/test-css-style"
+Exec=/bin/sh -c "cd @libexecdir@/installed-tests/gtk+/css/style && @libexecdir@/installed-tests/gtk+/css/style/test-css-style --tap"
 Type=session
+Output=TAP
diff --git a/testsuite/gdk/Makefile.am b/testsuite/gdk/Makefile.am
index 32b018a0c3..599dbba95b 100644
--- a/testsuite/gdk/Makefile.am
+++ b/testsuite/gdk/Makefile.am
@@ -37,7 +37,8 @@ insttest_PROGRAMS = $(TEST_PROGS)
 %.test: %$(EXEEXT) Makefile
 	$(AM_V_GEN) (echo '[Test]' > $@.tmp; \
 	echo 'Type=session' >> $@.tmp; \
-	echo 'Exec=$(insttestdir)/$<' >> $@.tmp; \
+	echo 'Output=TAP' >> $@.tmp; \
+	echo 'Exec=$(insttestdir)/$< --tap' >> $@.tmp; \
 	mv $@.tmp $@)
 
 test_files = $(TEST_PROGRS:=.test)
diff --git a/testsuite/gtk/Makefile.am b/testsuite/gtk/Makefile.am
index 7d1bda4e40..b6a7450c06 100644
--- a/testsuite/gtk/Makefile.am
+++ b/testsuite/gtk/Makefile.am
@@ -255,7 +255,8 @@ nobase_insttest_DATA = $(test_icontheme) $(test_ui)
 %.test: %$(EXEEXT) Makefile
 	$(AM_V_GEN) (echo '[Test]' > $@.tmp; \
 	echo 'Type=session' >> $@.tmp; \
-	echo 'Exec=env G_ENABLE_DIAGNOSTIC=0 $(insttestdir)/$<' >> $@.tmp; \
+	echo 'Output=TAP' >> $@.tmp; \
+	echo 'Exec=env G_ENABLE_DIAGNOSTIC=0 $(insttestdir)/$< --tap' >> $@.tmp; \
 	mv $@.tmp $@)
 
 test_files = $(TEST_PROGS:=.test)
diff --git a/testsuite/reftests/reftests-dark.test.in b/testsuite/reftests/reftests-dark.test.in
index ea3b40981f..9ff9e21406 100644
--- a/testsuite/reftests/reftests-dark.test.in
+++ b/testsuite/reftests/reftests-dark.test.in
@@ -1,3 +1,4 @@
 [Test]
-Exec=/bin/sh -c "env GTK_THEME=Adwaita:dark G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/gtk-reftest -k --verbose --output $(pwd) --directory @libexecdir@/installed-tests/gtk+/reftests"
+Exec=/bin/sh -c "env GTK_THEME=Adwaita:dark G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/gtk-reftest -k --verbose --tap --output $(pwd) --directory @libexecdir@/installed-tests/gtk+/reftests"
 Type=session-exclusive
+Output=TAP
diff --git a/testsuite/reftests/reftests-hc.test.in b/testsuite/reftests/reftests-hc.test.in
index 74751619d4..ea3ae9ed84 100644
--- a/testsuite/reftests/reftests-hc.test.in
+++ b/testsuite/reftests/reftests-hc.test.in
@@ -1,3 +1,4 @@
 [Test]
-Exec=/bin/sh -c "env GTK_THEME=HighContrast G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/gtk-reftest -k --verbose --output $(pwd) --directory @libexecdir@/installed-tests/gtk+/reftests"
+Exec=/bin/sh -c "env GTK_THEME=HighContrast G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/gtk-reftest -k --verbose --tap --output $(pwd) --directory @libexecdir@/installed-tests/gtk+/reftests"
 Type=session-exclusive
+Output=TAP
diff --git a/testsuite/reftests/reftests-hci.test.in b/testsuite/reftests/reftests-hci.test.in
index a6466c8b1d..d08bb983c7 100644
--- a/testsuite/reftests/reftests-hci.test.in
+++ b/testsuite/reftests/reftests-hci.test.in
@@ -1,3 +1,4 @@
 [Test]
-Exec=/bin/sh -c "env GTK_THEME=HighContrastInverse G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/gtk-reftest -k --verbose --output $(pwd) --directory @libexecdir@/installed-tests/gtk+/reftests"
+Exec=/bin/sh -c "env GTK_THEME=HighContrastInverse G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/gtk-reftest -k --verbose --tap --output $(pwd) --directory @libexecdir@/installed-tests/gtk+/reftests"
 Type=session-exclusive
+Output=TAP
diff --git a/testsuite/reftests/reftests.test.in b/testsuite/reftests/reftests.test.in
index 0c4d596192..6b8a42f319 100644
--- a/testsuite/reftests/reftests.test.in
+++ b/testsuite/reftests/reftests.test.in
@@ -1,3 +1,4 @@
 [Test]
-Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/gtk-reftest -k --verbose --output $(pwd) --directory @libexecdir@/installed-tests/gtk+/reftests"
+Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/gtk-reftest -k --verbose --tap --output $(pwd) --directory @libexecdir@/installed-tests/gtk+/reftests"
 Type=session-exclusive
+Output=TAP
diff --git a/testsuite/tools/Makefile.am b/testsuite/tools/Makefile.am
index c0fc0c3cdd..37f7a41aa9 100644
--- a/testsuite/tools/Makefile.am
+++ b/testsuite/tools/Makefile.am
@@ -36,6 +36,7 @@ nobase_insttest_DATA = $(test_simplify)
 test-simplify.test: test-simplify Makefile
 	$(AM_V_GEN) (echo '[Test]' > $@.tmp; \
 	echo 'Type=session' >> $@.tmp; \
+	echo 'Output=TAP' >> $@.tmp; \
 	echo 'Exec env G_ENABLE_DIAGNOSTIC=0 TEST_DATA_DIR="$(insttestdir)/simplify" $(insttestdir)/$<' >> $@.tmp; \
 	mv $@.tmp $@)