diff --git a/edksetup.sh b/edksetup.sh
index 0b7e33fd7776..f00154e25abf 100755
--- a/edksetup.sh
+++ b/edksetup.sh
@@ -35,11 +35,14 @@ function HelpMsg()
 
 function SetupEnv()
 {
-  if [ -z "$WORKSPACE" ]
+  if [ -n "$EDK_TOOLS_PATH" ]
+  then
+    . $EDK_TOOLS_PATH/BuildEnv $*
+  elif [ -n "$WORKSPACE" ]
   then
-    . BaseTools/BuildEnv $*
-  else
     . $WORKSPACE/BaseTools/BuildEnv $*
+  else
+    . BaseTools/BuildEnv $*
   fi
 }