diff --git a/meta/recipes-graphics/images/core-image-clutter.bb b/meta/recipes-graphics/images/core-image-clutter.bb
index 84ceb27..496246e 100644
--- a/meta/recipes-graphics/images/core-image-clutter.bb
+++ b/meta/recipes-graphics/images/core-image-clutter.bb
@@ -8,7 +8,6 @@ LICENSE = "MIT"
 IMAGE_INSTALL = "\
     ${CORE_IMAGE_BASE_INSTALL} \
     packagegroup-core-clutter-core \
-    packagegroup-core-clutter-tests \
-    packagegroup-core-clutter-apps"
+    "
 
 inherit core-image
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb
index b928096..2c62820 100644
--- a/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb
+++ b/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb
@@ -10,20 +10,11 @@ PR = "r4"
 inherit packagegroup
 
 PACKAGES = "\
-    packagegroup-core-clutter-core \
-    packagegroup-core-clutter-apps \
-    packagegroup-core-clutter-tests \
+    ${PN}-core \
     "
 
-RDEPENDS_packagegroup-core-clutter-core = "\
+RDEPENDS_${PN}-core = "\
     clutter-1.8 \
     clutter-gst-1.8 \
     clutter-gtk-1.8 \
     "
-
-#RDEPENDS_packagegroup-core-clutter-tests = "\
-#    clutter-gst-1.8-examples \
-#    clutter-gtk-1.8-examples"
-
-#RDEPENDS_packagegroup-core-clutter-apps = "\
-#    clutter-box2d "