diff --git a/config.json b/config.json
index 0902e8620b0d..c778d26f5b84 100644
--- a/config.json
+++ b/config.json
@@ -1303,12 +1303,18 @@
             "NEEDREPOS" : ["bitbake", "meta-mingw"],
             "DISTRO" : "nodistro",
             "step1" : {
-                "EXTRACMDS" : ["yocto-check-layer ../layers/meta-yocto/meta-poky"]
+                "EXTRACMDS" : [
+                    "bitbake-layers remove-layer meta-poky meta-yocto-bsp",
+                    "yocto-check-layer ../layers/openembedded-core/meta"
+                ]
             },
             "step2" : {
-                "EXTRACMDS" : ["yocto-check-layer ../layers/meta-yocto/meta-yocto-bsp"]
+                "EXTRACMDS" : ["yocto-check-layer ../layers/meta-yocto/meta-poky"]
             },
             "step3" : {
+                "EXTRACMDS" : ["yocto-check-layer ../layers/meta-yocto/meta-yocto-bsp"]
+            },
+            "step4" : {
                 "EXTRACMDS" : ["yocto-check-layer-wrapper ../meta-mingw"]
             }
         },