diff --git a/edksetup.sh b/edksetup.sh
index ec54f9ea40..93d6525758 100755
--- a/edksetup.sh
+++ b/edksetup.sh
@@ -54,7 +54,7 @@ function SetWorkspace()
     return 0
   fi
 
-  if [ ! ${BASH_SOURCE[0]} -ef ./edksetup.sh ]
+  if [ ! ${BASH_SOURCE[0]} -ef ./edksetup.sh ] && [ -z "$PACKAGES_PATH" ]
   then
     echo Run this script from the base of your tree.  For example:
     echo "  cd /Path/To/Edk/Root"