diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
index cebd0400f4..5c4ff3094c 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/meta/conf/distro/include/default-providers.inc
@@ -60,6 +60,7 @@ PREFERRED_PROVIDER_pkgconfig ?= "pkgconfig"
 PREFERRED_PROVIDER_nativesdk-pkgconfig ?= "nativesdk-pkgconfig"
 PREFERRED_PROVIDER_pkgconfig-native ?= "pkgconfig-native"
 PREFERRED_RPROVIDER_initd-functions ?= "initscripts"
+PREFERRED_RPROVIDER_dbus-x11 ?= "${VIRTUAL-RUNTIME_dbus}"
 
 PREFERRED_PROVIDER_nativesdk-mesa ?= "nativesdk-mesa"
 
diff --git a/meta/recipes-core/dbus/dbus-glib_0.112.bb b/meta/recipes-core/dbus/dbus-glib_0.112.bb
index 4acf435694..e0912e5d1e 100644
--- a/meta/recipes-core/dbus/dbus-glib_0.112.bb
+++ b/meta/recipes-core/dbus/dbus-glib_0.112.bb
@@ -33,7 +33,8 @@ FILES:${PN}-bash-completion += "${libexecdir}/dbus-bash-completion-helper"
 FILES:${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool"
 FILES:${PN}-dev += "${bindir}/dbus-binding-tool"
 
-RDEPENDS:${PN}-tests += "dbus-x11"
+RDEPENDS:${PN}-tests:class-target += "${PREFERRED_RPROVIDER_dbus-x11}"
+RDEPENDS:${PN}-tests:class-native += "dbus"
 FILES:${PN}-tests = "${datadir}/${BPN}/tests"
 
 BBCLASSEXTEND = "native"
diff --git a/meta/recipes-core/dbus/dbus_1.16.2.bb b/meta/recipes-core/dbus/dbus_1.16.2.bb
index 0160f403a1..ac9d73da9a 100644
--- a/meta/recipes-core/dbus/dbus_1.16.2.bb
+++ b/meta/recipes-core/dbus/dbus_1.16.2.bb
@@ -67,12 +67,11 @@ CONFFILES:${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session
 
 DEBIANNAME:${PN} = "dbus-1"
 
-OLDPKGNAME = "dbus-x11"
-OLDPKGNAME:class-nativesdk = ""
-
 # for compatibility
-RPROVIDES:${PN} = "${OLDPKGNAME}"
-RREPLACES:${PN} += "${OLDPKGNAME}"
+RPROVIDES:${PN}:class-target = "dbus-x11"
+RPROVIDES:${PN}:class-native = "dbus-x11"
+RREPLACES:${PN}:class-target += "dbus-x11"
+RREPLACES:${PN}:class-native += "dbus-x11"
 
 FILES:${PN} = "${bindir}/dbus-daemon* \
                ${bindir}/dbus-cleanup-sockets \
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb
index 91db7ed33b..26cb588999 100644
--- a/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb
+++ b/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb
@@ -31,5 +31,5 @@ RDEPENDS:${PN}-utils = "\
     xmodmap \
     xdpyinfo \
     xinput-calibrator \
-    dbus-x11 \
+    ${PREFERRED_RPROVIDER_dbus-x11} \
     "