2 files changed, 4 insertions, 3 deletions

diff --git a/meta/classes/imagetest-qemu.bbclass b/meta/classes/imagetest-qemu.bbclass
index 742b759208..feab868476 100644
--- a/meta/classes/imagetest-qemu.bbclass
+++ b/meta/classes/imagetest-qemu.bbclass
@@ -47,6 +47,7 @@ python do_qemuimagetest() {
         os.environ["QEMUARCH"] = machine
         os.environ["QEMUTARGET"] = pname
         os.environ["DISPLAY"] = bb.data.getVar("DISPLAY", d, True)
+        os.environ["POKYBASE"] = bb.data.getVar("POKYBASE", d, True)
 
         """run Test Case"""
         bb.note("Run %s test in scenario %s" % (case, scen))
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 94e96f8524..31b8dd2b07 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -194,11 +194,11 @@ def check_sanity(e):
                 f.write(current_abi)
         f.close()
 
-        oeroot = data.getVar('OEROOT', e.data)
+        oeroot = data.getVar('POKYBASE', e.data)
         if oeroot.find ('+') != -1:
-                messages = messages + "Error, you have an invalid character (+) in your OEROOT directory path. Please more Poky to a directory which doesn't include a +."
+                messages = messages + "Error, you have an invalid character (+) in your POKYBASE directory path. Please more Poky to a directory which doesn't include a +."
         elif oeroot.find (' ') != -1:
-                messages = messages + "Error, you have a space in your OEROOT directory path. Please move Poky to a directory which doesn't include a space."
+                messages = messages + "Error, you have a space in your POKYBASE directory path. Please move Poky to a directory which doesn't include a space."
 
         if messages != "":
                 raise_sanity_error(messages)