diff --git a/.travis.yml b/.travis.yml
index 4caa7d7..71d261e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,43 +1,30 @@
-sudo: required
-dist: trusty
-group: deprecated-2017Q4
-language: c
+language: generic
 env:
-  - BD1=esp8266:esp8266:nodemcuv2:CpuFrequency=160,FlashSize=4M3M BD2=esp32:esp32:esp32:FlashSize=4M
+  global:
+    - IDE_VERSION=1.8.5
+  matrix:
+    - BOARD="esp8266:esp8266:nodemcuv2"
+    - BOARD="espressif:esp32:esp32"
 before_install:
   - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_1.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :1 -ac -screen 0 1280x1024x16"
   - sleep 3
   - export DISPLAY=:1.0
-  - wget http://downloads.arduino.cc/arduino-1.8.2-linux64.tar.xz
-  - tar xf arduino-1.8.2-linux64.tar.xz
-  - sudo mv arduino-1.8.2 /usr/local/share/arduino
-  - sudo ln -s /usr/local/share/arduino/arduino /usr/local/bin/arduino
-install:
-  - ln -s $PWD /usr/local/share/arduino/libraries/AutoConnect
-  - arduino --pref "boardsmanager.additional.urls=http://arduino.esp8266.com/stable/package_esp8266com_index.json,https://dl.espressif.com/dl/package_esp32_index.json" --save-prefs
+  - wget http://downloads.arduino.cc/arduino-$IDE_VERSION-linux64.tar.xz
+  - tar xf arduino-$IDE_VERSION-linux64.tar.xz
+  - sudo mv arduino-$IDE_VERSION ~/arduino-ide
+  - export PATH=$PATH:~/arduino-ide
+  - arduino --pref "boardsmanager.additional.urls=http://arduino.esp8266.com/stable/package_esp8266com_index.json,http://dl.espressif.com/dl/package_esp32_index.json" --save-prefs
   - arduino --install-boards esp8266:esp8266
-  - arduino --install-boards esp32:esp32
-  - arduino --pref "compiler.warning_level=all" --save-prefs
-#  - arduino --install-library "PageBuilder"
-  - git clone https://github.com/Hieromon/PageBuilder /usr/local/share/arduino/libraries/PageBuilder
-  - arduino --install-library "PubSubClient"
+  - arduino --install-boards espressif:esp32
+  - arduino --install-library PubSubClient,PageBuilder:1.1.0
+  - buildExampleSketch() { arduino --verbose-build --verify --board $BOARD $PWD/examples/$1/$1.ino; }
+install:
+  - mkdir -p ~/Arduino/libraries
+  - ln -s $PWD ~/Arduino/libraries/.
 script:
- - arduino --verify --board $BD1 $PWD/examples/Credential/Credential.ino
- - arduino --verify --board $BD2 $PWD/examples/Credential/Credential.ino
- - arduino --verify --board $BD1 $PWD/examples/FSBrowser/FSBrowser.ino
- - arduino --verify --board $BD2 $PWD/examples/FSBrowser/FSBrowser.ino
- - arduino --verify --board $BD1 $PWD/examples/HandleClient/HandleClient.ino
- - arduino --verify --board $BD2 $PWD/examples/HandleClient/HandleClient.ino
- - arduino --verify --board $BD1 $PWD/examples/HandlePortal/HandlePortal.ino
- - arduino --verify --board $BD2 $PWD/examples/HandlePortal/HandlePortal.ino
- - arduino --verify --board $BD1 $PWD/examples/HandlePortalEX/HandlePortalEX.ino
- - arduino --verify --board $BD2 $PWD/examples/HandlePortalEX/HandlePortalEX.ino
- - arduino --verify --board $BD1 $PWD/examples/mqttRSSI/mqttRSSI.ino
- - arduino --verify --board $BD2 $PWD/examples/mqttRSSI/mqttRSSI.ino
- - arduino --verify --board $BD1 $PWD/examples/Simple/Simple.ino
- - arduino --verify --board $BD2 $PWD/examples/Simple/Simple.ino
-
-notifications:
-  email:
-    on_success: change
-    on_failure: change
\ No newline at end of file
+  - buildExampleSketch Credential
+  - buildExampleSketch FSBrowser
+  - buildExampleSketch HandleClient
+  - buildExampleSketch HandleClientEX
+  - buildExampleSketch Simple
+  - buildExampleSketch mqttRSSI