diff --git a/config.json b/config.json
index c778d26f5b84..31cf783a60ae 100644
--- a/config.json
+++ b/config.json
@@ -1302,17 +1302,19 @@
         "check-layer" : {
             "NEEDREPOS" : ["bitbake", "meta-mingw"],
             "DISTRO" : "nodistro",
+            "MACHINE" : "unset",
+            "extravars" : ["MACHINE ?= 'qemux86-64'"],
             "step1" : {
                 "EXTRACMDS" : [
                     "bitbake-layers remove-layer meta-poky meta-yocto-bsp",
-                    "yocto-check-layer ../layers/openembedded-core/meta"
+                    "yocto-check-layer ../layers/openembedded-core/meta --machines qemuarm qemuarm64 qemuarmv5 qemuloongarch64 qemumips qemumips64 qemuppc qemuppc64 qemuriscv32 qemuriscv64 qemux86-64 qemux86"
                 ]
             },
             "step2" : {
                 "EXTRACMDS" : ["yocto-check-layer ../layers/meta-yocto/meta-poky"]
             },
             "step3" : {
-                "EXTRACMDS" : ["yocto-check-layer ../layers/meta-yocto/meta-yocto-bsp"]
+                "EXTRACMDS" : ["yocto-check-layer ../layers/meta-yocto/meta-yocto-bsp --machines beaglebone-yocto genericarm64 genericx86-64 genericx86"]
             },
             "step4" : {
                 "EXTRACMDS" : ["yocto-check-layer-wrapper ../meta-mingw"]