diff --git a/.travis.yml b/.travis.yml
index 4e3996e7093..b6295709dd1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,9 @@
 sudo: false
-language: bash
+
+language: python
+python:
+  - "2.7"
+
 os:
   - linux
 
@@ -27,6 +31,11 @@ script:
   - cat size.log
   - echo -e "travis_fold:end:size_report"
 
+  # test library examples with PlatformIO
+  - pip install -U https://github.com/platformio/platformio/archive/develop.zip
+  - platformio platform install https://github.com/platformio/platform-espressif32.git#feature/stage
+  - "python -c \"import glob,subprocess,sys; map(lambda p: (sys.stdout.write('Library example: %s\\n' % p), subprocess.call(['pio', 'ci', p, '--board', 'esp32dev'])), glob.glob('libraries/*/examples/*/'))\""
+
 notifications:
   email:
     on_success: change
diff --git a/tools/platformio-build.py b/tools/platformio-build.py
index 413843b9f0b..152afd3ab03 100644
--- a/tools/platformio-build.py
+++ b/tools/platformio-build.py
@@ -22,6 +22,8 @@
 http://arduino.cc/en/Reference/HomePage
 """
 
+# Extends: https://github.com/platformio/platform-espressif32/blob/develop/builder/main.py
+
 from os.path import isdir, join
 
 from SCons.Script import DefaultEnvironment