diff --git a/.travis.yml b/.travis.yml
index f1c777e81c9..3929a491e89 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,7 +39,7 @@ script:
   - echo -e "travis_fold:start:platformio_test_env_prepare"
   - pip install -U https://github.com/platformio/platformio/archive/develop.zip
   - platformio platform install https://github.com/platformio/platform-espressif32.git#feature/stage
-  - sed -i 's/https:\/\/github\.com\/espressif\/arduino-esp32\.git/*/' ~/.platformio/platforms/espressif32_stage/platform.json
+  - sed -i 's/https:\/\/github\.com\/espressif\/arduino-esp32\.git/*/' ~/.platformio/platforms/espressif32/platform.json
   - ln -s $TRAVIS_BUILD_DIR ~/.platformio/packages/framework-arduinoespressif32
   - echo -e "travis_fold:end:platformio_test_env_prepare"
   - echo -e "travis_fold:start:platformio_test"
diff --git a/tools/platformio-build.py b/tools/platformio-build.py
index c3950451efb..b3274f4c25b 100644
--- a/tools/platformio-build.py
+++ b/tools/platformio-build.py
@@ -133,9 +133,9 @@ def _get_board_flash_mode(env):
     ],
 
     UPLOADERFLAGS=[
-        "0x1000", '"%s"' % join(FRAMEWORK_DIR, "tools", "sdk", "bin", "bootloader_${BOARD_FLASH_MODE}_${__get_board_f_flash(__env__)}.bin"),
-        "0x8000", '"%s"' % join("$BUILD_DIR", "partitions.bin"),
-        "0xe000", '"%s"' % join(FRAMEWORK_DIR, "tools", "partitions", "boot_app0.bin"),
+        "0x1000", join(FRAMEWORK_DIR, "tools", "sdk", "bin", "bootloader_${BOARD_FLASH_MODE}_${__get_board_f_flash(__env__)}.bin"),
+        "0x8000", join("$BUILD_DIR", "partitions.bin"),
+        "0xe000", join(FRAMEWORK_DIR, "tools", "partitions", "boot_app0.bin"),
         "0x10000"
     ]
 )