diff --git a/poky-init-build-env b/poky-init-build-env
index 0f5e684a52..075070370b 100755
--- a/poky-init-build-env
+++ b/poky-init-build-env
@@ -19,10 +19,10 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 
-if test x"$0" = x"./poky-init-build-env"; then
-   echo "Error: Run via '. ./poky-init-build-env'"
-elif test x"$BASH_SOURCE" = x; then
-   echo "Error: you are not running a Bash shell, please use Bash or add support for your shell to the init scripts"
+if [ "x$0" = "x./poky-init-build-env" ]; then
+   echo "Error: This script needs to be sourced. Please run as '. ./poky-init-build-env'"
+elif [ "x$BASH_SOURCE" = "x" ]; then
+   echo "Error: You are not running a Bash shell. Please use Bash or add support for your shell to the init scripts"
 else
    . `dirname $BASH_SOURCE`/scripts/poky-env-internal
 fi