diff --git a/packages/debug/meta b/packages/debug/meta
index a16e106e49..e5812c1bd5 100644
--- a/packages/debug/meta
+++ b/packages/debug/meta
@@ -35,10 +35,6 @@ PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"
 
-if [ "$OPENGL" = Mesa ]; then
-  PKG_DEPENDS="$PKG_DEPENDS mesa-demos"
-fi
-
 if [ "$DISPLAYSERVER" = xorg-server ]; then
   PKG_DEPENDS="$PKG_DEPENDS mrxvt"
 fi
diff --git a/packages/graphics/Mesa/meta b/packages/graphics/Mesa/meta
index 16f90ea962..34c0f9f7dd 100644
--- a/packages/graphics/Mesa/meta
+++ b/packages/graphics/Mesa/meta
@@ -51,3 +51,7 @@ if [ "$MESA_VAAPI_SUPPORT" = "yes" ]; then
   PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libva"
   PKG_DEPENDS="$PKG_DEPENDS libva"
 fi
+
+if [ "$DEVTOOLS" = yes ]; then
+  PKG_DEPENDS="$PKG_DEPENDS mesa-demos"
+fi