diff --git a/platform.txt b/platform.txt
index c7c1f7a7f..a408813f4 100644
--- a/platform.txt
+++ b/platform.txt
@@ -39,6 +39,7 @@ compiler.elf2hex.flags=
 compiler.size.cmd=xtensa-lx106-elf-size
 
 compiler.esptool.cmd=esptool
+compiler.esptool.cmd.windows=esptool.exe
 
 # This can be overriden in boards.txt
 build.extra_flags=-DESP8266
@@ -85,7 +86,7 @@ recipe.size.regex=^(?:\.text|\.data|\.rodata|\.irom0\.text|)\s+([0-9]+).*
 
 tools.esptool.cmd=esptool
 tools.esptool.cmd.windows=esptool.exe
-tools.esptool.path={compiler.tools.path}
+tools.esptool.path={runtime.platform.path}/tools
 
 tools.esptool.upload.protocol=esp
 tools.esptool.upload.params.verbose=-vv