diff --git a/clutter/tests/conform/Makefile.am b/clutter/tests/conform/Makefile.am
index 92deaf7a5..69e5dd432 100644
--- a/clutter/tests/conform/Makefile.am
+++ b/clutter/tests/conform/Makefile.am
@@ -1,3 +1,5 @@
+installed_test_metadir = $(datadir)/installed-tests/mutter-clutter
+installed_testdir = $(libexecdir)/installed-tests/mutter-clutter
 include $(top_srcdir)/build/autotools/glib-tap.mk
 
 AM_CFLAGS = -g $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
diff --git a/cogl/tests/Makefile.am b/cogl/tests/Makefile.am
index 94ba34a6f..7e483291f 100644
--- a/cogl/tests/Makefile.am
+++ b/cogl/tests/Makefile.am
@@ -25,7 +25,7 @@ endif
 check-local: test
 
 if ENABLE_INSTALLED_TESTS
-insttestdir = $(libexecdir)/installed-tests/$(PACKAGE)
+insttestdir = $(libexecdir)/installed-tests/mutter-cogl
 insttest_SCRIPTS = run-tests.sh
 insttest_DATA = config.env
 endif
diff --git a/cogl/tests/conform/Makefile.am b/cogl/tests/conform/Makefile.am
index a8087ce20..b2c53237a 100644
--- a/cogl/tests/conform/Makefile.am
+++ b/cogl/tests/conform/Makefile.am
@@ -158,18 +158,18 @@ clean-generic: clean-wrappers
 
 if ENABLE_INSTALLED_TESTS
 
-insttestdir = $(libexecdir)/installed-tests/$(PACKAGE)/conform
+insttestdir = $(libexecdir)/installed-tests/mutter-cogl/conform
 insttest_PROGRAMS = test-conformance
 insttest_DATA = unit-tests
 
-testmetadir = $(datadir)/installed-tests/$(PACKAGE)
+testmetadir = $(datadir)/installed-tests/mutter-cogl
 testmeta_DATA = conform.test
 
 conform.test:
 	echo "  GEN      $@"; \
 	echo "[Test]" > $@.tmp; \
 	echo "Type=session" >> $@.tmp; \
-	echo "Exec=sh -c \"cd $(libexecdir)/installed-tests/$(PACKAGE)/conform; ../run-tests.sh ../config.env ./test-conformance\"" >> $@.tmp; \
+	echo "Exec=sh -c \"cd $(libexecdir)/installed-tests/mutter-cogl/conform; ../run-tests.sh ../config.env ./test-conformance\"" >> $@.tmp; \
 	mv $@.tmp $@
 
 CLEANFILES = conform.test