diff --git a/testsuite/gtk/accel.test.in b/testsuite/gtk/accel.test.in
index 3b650c8606..dd0845ad48 100644
--- a/testsuite/gtk/accel.test.in
+++ b/testsuite/gtk/accel.test.in
@@ -1,3 +1,3 @@
 [Test]
-Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/NAME"
+Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/accel"
 Type=session
diff --git a/testsuite/gtk/accessible.test.in b/testsuite/gtk/accessible.test.in
index 3b650c8606..23b074d56a 100644
--- a/testsuite/gtk/accessible.test.in
+++ b/testsuite/gtk/accessible.test.in
@@ -1,3 +1,3 @@
 [Test]
-Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/NAME"
+Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/accessible"
 Type=session
diff --git a/testsuite/gtk/action.test.in b/testsuite/gtk/action.test.in
index 3b650c8606..a6e812a10b 100644
--- a/testsuite/gtk/action.test.in
+++ b/testsuite/gtk/action.test.in
@@ -1,3 +1,3 @@
 [Test]
-Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/NAME"
+Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/action"
 Type=session
diff --git a/testsuite/gtk/bitmask.test.in b/testsuite/gtk/bitmask.test.in
index 3b650c8606..b83a9159e4 100644
--- a/testsuite/gtk/bitmask.test.in
+++ b/testsuite/gtk/bitmask.test.in
@@ -1,3 +1,3 @@
 [Test]
-Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/NAME"
+Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/bitmask"
 Type=session
diff --git a/testsuite/gtk/builder.test.in b/testsuite/gtk/builder.test.in
index 3b650c8606..5974e0256a 100644
--- a/testsuite/gtk/builder.test.in
+++ b/testsuite/gtk/builder.test.in
@@ -1,3 +1,3 @@
 [Test]
-Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/NAME"
+Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/builder"
 Type=session
diff --git a/testsuite/gtk/cellarea.test.in b/testsuite/gtk/cellarea.test.in
index 3b650c8606..25db9358d5 100644
--- a/testsuite/gtk/cellarea.test.in
+++ b/testsuite/gtk/cellarea.test.in
@@ -1,3 +1,3 @@
 [Test]
-Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/NAME"
+Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/cellarea"
 Type=session
diff --git a/testsuite/gtk/crossingevents.test.in b/testsuite/gtk/crossingevents.test.in
index 3b650c8606..e586fda04d 100644
--- a/testsuite/gtk/crossingevents.test.in
+++ b/testsuite/gtk/crossingevents.test.in
@@ -1,3 +1,3 @@
 [Test]
-Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/NAME"
+Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/crossingevents"
 Type=session
diff --git a/testsuite/gtk/defaultvalue.test.in b/testsuite/gtk/defaultvalue.test.in
index 3b650c8606..1d330c9ae4 100644
--- a/testsuite/gtk/defaultvalue.test.in
+++ b/testsuite/gtk/defaultvalue.test.in
@@ -1,3 +1,3 @@
 [Test]
-Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/NAME"
+Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/defaultvalue"
 Type=session
diff --git a/testsuite/gtk/entry.test.in b/testsuite/gtk/entry.test.in
index 3b650c8606..bc0c1c0c99 100644
--- a/testsuite/gtk/entry.test.in
+++ b/testsuite/gtk/entry.test.in
@@ -1,3 +1,3 @@
 [Test]
-Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/NAME"
+Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/entry"
 Type=session
diff --git a/testsuite/gtk/expander.test.in b/testsuite/gtk/expander.test.in
index 3b650c8606..4bb32e4bed 100644
--- a/testsuite/gtk/expander.test.in
+++ b/testsuite/gtk/expander.test.in
@@ -1,3 +1,3 @@
 [Test]
-Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/NAME"
+Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/expander"
 Type=session
diff --git a/testsuite/gtk/filechooser.test.in b/testsuite/gtk/filechooser.test.in
index 3b650c8606..b670d2032a 100644
--- a/testsuite/gtk/filechooser.test.in
+++ b/testsuite/gtk/filechooser.test.in
@@ -1,3 +1,3 @@
 [Test]
-Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/NAME"
+Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/filechooser"
 Type=session
diff --git a/testsuite/gtk/floating.test.in b/testsuite/gtk/floating.test.in
index 3b650c8606..d65ab5c8e6 100644
--- a/testsuite/gtk/floating.test.in
+++ b/testsuite/gtk/floating.test.in
@@ -1,3 +1,3 @@
 [Test]
-Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/NAME"
+Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/floating"
 Type=session
diff --git a/testsuite/gtk/grid.test.in b/testsuite/gtk/grid.test.in
index 3b650c8606..9276c84242 100644
--- a/testsuite/gtk/grid.test.in
+++ b/testsuite/gtk/grid.test.in
@@ -1,3 +1,3 @@
 [Test]
-Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/NAME"
+Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/grid"
 Type=session
diff --git a/testsuite/gtk/gtkmenu.test.in b/testsuite/gtk/gtkmenu.test.in
index 3b650c8606..100559fc66 100644
--- a/testsuite/gtk/gtkmenu.test.in
+++ b/testsuite/gtk/gtkmenu.test.in
@@ -1,3 +1,3 @@
 [Test]
-Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/NAME"
+Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/gtkmenu"
 Type=session
diff --git a/testsuite/gtk/keyhash.test.in b/testsuite/gtk/keyhash.test.in
index 3b650c8606..6d45ad6775 100644
--- a/testsuite/gtk/keyhash.test.in
+++ b/testsuite/gtk/keyhash.test.in
@@ -1,3 +1,3 @@
 [Test]
-Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/NAME"
+Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/keyhash"
 Type=session
diff --git a/testsuite/gtk/object.test.in b/testsuite/gtk/object.test.in
index 3b650c8606..0621a6e8f9 100644
--- a/testsuite/gtk/object.test.in
+++ b/testsuite/gtk/object.test.in
@@ -1,3 +1,3 @@
 [Test]
-Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/NAME"
+Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/object"
 Type=session
diff --git a/testsuite/gtk/objects-finalize.test.in b/testsuite/gtk/objects-finalize.test.in
index 3b650c8606..b4b231bc7c 100644
--- a/testsuite/gtk/objects-finalize.test.in
+++ b/testsuite/gtk/objects-finalize.test.in
@@ -1,3 +1,3 @@
 [Test]
-Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/NAME"
+Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/objects-finalize"
 Type=session
diff --git a/testsuite/gtk/papersize.test.in b/testsuite/gtk/papersize.test.in
index 3b650c8606..9fb1eee0ef 100644
--- a/testsuite/gtk/papersize.test.in
+++ b/testsuite/gtk/papersize.test.in
@@ -1,3 +1,3 @@
 [Test]
-Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/NAME"
+Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/papersize"
 Type=session
diff --git a/testsuite/gtk/rbtree.test.in b/testsuite/gtk/rbtree.test.in
index 3b650c8606..4f89c93b46 100644
--- a/testsuite/gtk/rbtree.test.in
+++ b/testsuite/gtk/rbtree.test.in
@@ -1,3 +1,3 @@
 [Test]
-Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/NAME"
+Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/rbtree"
 Type=session
diff --git a/testsuite/gtk/recentmanager.test.in b/testsuite/gtk/recentmanager.test.in
index 3b650c8606..35b42076f4 100644
--- a/testsuite/gtk/recentmanager.test.in
+++ b/testsuite/gtk/recentmanager.test.in
@@ -1,3 +1,3 @@
 [Test]
-Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/NAME"
+Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/recentmanager"
 Type=session
diff --git a/testsuite/gtk/regression-tests.test.in b/testsuite/gtk/regression-tests.test.in
index 3b650c8606..24b7cea5cf 100644
--- a/testsuite/gtk/regression-tests.test.in
+++ b/testsuite/gtk/regression-tests.test.in
@@ -1,3 +1,3 @@
 [Test]
-Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/NAME"
+Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/regression-tests"
 Type=session
diff --git a/testsuite/gtk/stylecontext.test.in b/testsuite/gtk/stylecontext.test.in
index 3b650c8606..2c9dadbd83 100644
--- a/testsuite/gtk/stylecontext.test.in
+++ b/testsuite/gtk/stylecontext.test.in
@@ -1,3 +1,3 @@
 [Test]
-Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/NAME"
+Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/stylecontext"
 Type=session
diff --git a/testsuite/gtk/templates.test.in b/testsuite/gtk/templates.test.in
index 3b650c8606..8b097b1a2d 100644
--- a/testsuite/gtk/templates.test.in
+++ b/testsuite/gtk/templates.test.in
@@ -1,3 +1,3 @@
 [Test]
-Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/NAME"
+Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/templates"
 Type=session
diff --git a/testsuite/gtk/testing.test.in b/testsuite/gtk/testing.test.in
index 3b650c8606..8a62be6e5a 100644
--- a/testsuite/gtk/testing.test.in
+++ b/testsuite/gtk/testing.test.in
@@ -1,3 +1,3 @@
 [Test]
-Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/NAME"
+Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/testing"
 Type=session
diff --git a/testsuite/gtk/textbuffer.test.in b/testsuite/gtk/textbuffer.test.in
index 3b650c8606..8721ca571b 100644
--- a/testsuite/gtk/textbuffer.test.in
+++ b/testsuite/gtk/textbuffer.test.in
@@ -1,3 +1,3 @@
 [Test]
-Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/NAME"
+Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/textbuffer"
 Type=session
diff --git a/testsuite/gtk/textiter.test.in b/testsuite/gtk/textiter.test.in
index 3b650c8606..8f45581c94 100644
--- a/testsuite/gtk/textiter.test.in
+++ b/testsuite/gtk/textiter.test.in
@@ -1,3 +1,3 @@
 [Test]
-Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/NAME"
+Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/textiter"
 Type=session
diff --git a/testsuite/gtk/treemodel.test.in b/testsuite/gtk/treemodel.test.in
index 3b650c8606..eb56425a81 100644
--- a/testsuite/gtk/treemodel.test.in
+++ b/testsuite/gtk/treemodel.test.in
@@ -1,3 +1,3 @@
 [Test]
-Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/NAME"
+Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/treemodel"
 Type=session
diff --git a/testsuite/gtk/treepath.test.in b/testsuite/gtk/treepath.test.in
index 3b650c8606..371c3e0c5a 100644
--- a/testsuite/gtk/treepath.test.in
+++ b/testsuite/gtk/treepath.test.in
@@ -1,3 +1,3 @@
 [Test]
-Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/NAME"
+Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/treepath"
 Type=session
diff --git a/testsuite/gtk/treeview-scrolling.test.in b/testsuite/gtk/treeview-scrolling.test.in
index 3b650c8606..8b5f49c5b8 100644
--- a/testsuite/gtk/treeview-scrolling.test.in
+++ b/testsuite/gtk/treeview-scrolling.test.in
@@ -1,3 +1,3 @@
 [Test]
-Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/NAME"
+Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/treeview-scrolling"
 Type=session
diff --git a/testsuite/gtk/treeview.test.in b/testsuite/gtk/treeview.test.in
index 3b650c8606..0257e0cd60 100644
--- a/testsuite/gtk/treeview.test.in
+++ b/testsuite/gtk/treeview.test.in
@@ -1,3 +1,3 @@
 [Test]
-Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/NAME"
+Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/treeview"
 Type=session
diff --git a/testsuite/gtk/window.test.in b/testsuite/gtk/window.test.in
index 3b650c8606..f9f3a401b6 100644
--- a/testsuite/gtk/window.test.in
+++ b/testsuite/gtk/window.test.in
@@ -1,3 +1,3 @@
 [Test]
-Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/NAME"
+Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/window"
 Type=session