diff --git a/meta/lib/oeqa/selftest/context.py b/meta/lib/oeqa/selftest/context.py
index c9eb481725..e042eb1a78 100644
--- a/meta/lib/oeqa/selftest/context.py
+++ b/meta/lib/oeqa/selftest/context.py
@@ -141,6 +141,9 @@ class OESelftestTestContext(OETestContext):
         # Set SSTATE_DIR to match the parent SSTATE_DIR
         subprocess.check_output("echo 'SSTATE_DIR ?= \"%s\"' >> %s/conf/local.conf" % (sstatedir, newbuilddir), cwd=newbuilddir, shell=True)
 
+        # Clear SANITY_TESTED_DISTROS however it was set
+        subprocess.check_output("echo 'SANITY_TESTED_DISTROS:forcevariable = \"\"' >> %s/conf/local.conf" % newbuilddir, cwd=newbuilddir, shell=True)
+
         os.chdir(newbuilddir)
 
         def patch_test(t):
@@ -349,10 +352,6 @@ class OESelftestTestContextExecutor(OETestContextExecutor):
             self.tc.logger.error("Please unset PRSERV_HOST in order to run oe-selftest")
             raise OEQAPreRun
 
-        if "SANITY_TESTED_DISTROS" in self.tc.td:
-            self.tc.logger.error("Please unset SANITY_TESTED_DISTROS in order to run oe-selftest")
-            raise OEQAPreRun
-
         _add_layer_libs()
 
         self.tc.logger.info("Checking base configuration is valid/parsable")