diff --git a/config.json b/config.json
index f65563b..84adeb2 100644
--- a/config.json
+++ b/config.json
@@ -249,10 +249,12 @@
             ]
         },
         "selftest" : {
-            "MACHINE" : "qemux86-64",
+            "MACHINE" : "unset",
+            "DISTRO" : "unset",
             "PACKAGE_CLASSES" : "package_rpm",
             "extravars" : [
                 "RPM_GPG_SIGN_CHUNK = '1'",
+                "DISTRO = 'poky'",
                 "IMAGE_INSTALL:append = ' ssh-pregen-hostkeys'"
             ],
             "step1" : {
@@ -1150,27 +1152,61 @@
             ]
         },
         "oe-selftest" : {
-            "TEMPLATE" : "selftest"
+            "TEMPLATE" : "selftest",
+            "step2" : {
+                "extravars" : [
+                    "MACHINE = 'qemux86-64'"
+                ]
+            }
         },
         "oe-selftest-ubuntu" : {
-            "TEMPLATE" : "selftest"
+            "TEMPLATE" : "selftest",
+            "step2" : {
+                "extravars" : [
+                    "MACHINE = 'qemux86-64'"
+                ]
+            }
         },
         "oe-selftest-debian" : {
-            "TEMPLATE" : "selftest"
+            "TEMPLATE" : "selftest",
+            "step2" : {
+                "extravars" : [
+                    "MACHINE = 'qemux86-64'"
+                ]
+            }
         },
         "oe-selftest-fedora" : {
-            "TEMPLATE" : "selftest"
+            "TEMPLATE" : "selftest",
+            "step2" : {
+                "extravars" : [
+                    "MACHINE = 'qemux86-64'"
+                ]
+            }
         },
         "oe-selftest-opensuse" : {
-            "TEMPLATE" : "selftest"
+            "TEMPLATE" : "selftest",
+            "step2" : {
+                "extravars" : [
+                    "MACHINE = 'qemux86-64'"
+                ]
+            }
         },
         "oe-selftest-centos" : {
-            "TEMPLATE" : "selftest"
+            "TEMPLATE" : "selftest",
+            "step2" : {
+                "extravars" : [
+                    "MACHINE = 'qemux86-64'"
+                ]
+            }
         },
         "oe-selftest-armhost" : {
-            "MACHINE": "qemuarm64",
             "SDKMACHINE": "aarch64",
-            "TEMPLATE" : "selftest"
+            "TEMPLATE" : "selftest",
+            "step2" : {
+                "extravars" : [
+                    "MACHINE = 'qemuarm64'"
+                ]
+            }
         },
         "reproducible" : {
             "TEMPLATE" : "reproducible"
diff --git a/scripts/setup-config b/scripts/setup-config
index c311d95..c06dabf 100755
--- a/scripts/setup-config
+++ b/scripts/setup-config
@@ -65,6 +65,9 @@ machine = utils.getconfigvar("MACHINE", ourconfig, args.target, stepnum)
 distro = utils.getconfigvar("DISTRO", ourconfig, args.target, stepnum)
 
 def enable_fragment(fragment):
+    if fragment.endswith("/unset"):
+        return
+
     cmd = ". ./init-build-env; bitbake-config-build enable-fragment %s" % fragment
     cmdpath = args.builddir