diff --git a/x-pack/plugin/sql/src/main/bin/elasticsearch-sql-cli b/x-pack/plugin/sql/src/main/bin/elasticsearch-sql-cli
index 676b842beed..47916a7975e 100755
--- a/x-pack/plugin/sql/src/main/bin/elasticsearch-sql-cli
+++ b/x-pack/plugin/sql/src/main/bin/elasticsearch-sql-cli
@@ -6,9 +6,9 @@
 
 source "`dirname "$0"`"/elasticsearch-env
 
-source "`dirname "$0"`"/x-pack-env
+source "$ES_HOME"/bin/x-pack-env
 
-CLI_JAR=$(ls $ES_HOME/bin/elasticsearch-sql-cli-*.jar)
+CLI_JAR=$(ls "$ES_HOME"/bin/elasticsearch-sql-cli-*.jar)
 
 exec \
   "$JAVA" \
diff --git a/x-pack/plugin/sql/src/main/bin/elasticsearch-sql-cli.bat b/x-pack/plugin/sql/src/main/bin/elasticsearch-sql-cli.bat
index 48daf97b515..e9812981517 100644
--- a/x-pack/plugin/sql/src/main/bin/elasticsearch-sql-cli.bat
+++ b/x-pack/plugin/sql/src/main/bin/elasticsearch-sql-cli.bat
@@ -9,7 +9,7 @@ setlocal enableextensions
 
 call "%~dp0elasticsearch-env.bat" || exit /b 1
 
-call "%~dp0x-pack-env.bat" || exit /b 1
+call "%ES_HOME%/bin/x-pack-env.bat" || exit /b 1
 
 set CLI_JAR=%ES_HOME%/bin/*