diff --git a/.travis.yml b/.travis.yml
index 43fb79f..099a2ec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,21 +8,6 @@ cache:
     directories:
         - "~/.platformio"    
 
-env:
-    - PLATFORMIO_CI_SRC=examples/AiwaRCT501SendDemo PLATFORMIO_BUILD_FLAGS="-DSEND_AIWA_RC_T501"
-    - PLATFORMIO_CI_SRC=examples/IRrecord PLATFORMIO_BUILD_FLAGS="-DSEND_NEC -DSEND_SONY -DSEND_RC5 -DSEND_RC6"
-    - PLATFORMIO_CI_SRC=examples/IRrecvDemo
-    - PLATFORMIO_CI_SRC=examples/IRrecvDump
-    - PLATFORMIO_CI_SRC=examples/IRrecvDumpV2
-    - PLATFORMIO_CI_SRC=examples/IRrelay
-    - PLATFORMIO_CI_SRC=examples/IRsendDemo PLATFORMIO_BUILD_FLAGS="-DSEND_SONY"
-    - PLATFORMIO_CI_SRC=examples/IRtest PLATFORMIO_BUILD_FLAGS="-DSEND_NEC -DSEND_SONY -DSEND_RC5 -DSEND_RC6"
-    - PLATFORMIO_CI_SRC=examples/IRtest2 PLATFORMIO_BUILD_FLAGS="-DSEND_NEC -DSEND_SONY -DSEND_RC5 -DSEND_RC6"
-    - PLATFORMIO_CI_SRC=examples/JVCPanasonicSendDemo PLATFORMIO_BUILD_FLAGS="-DSEND_JVC -DSEND_PANASONIC"
-    - PLATFORMIO_CI_SRC=examples/LegoPowerFunctionsSendDemo PLATFORMIO_BUILD_FLAGS="-DSEND_LEGO_PF"
-    - PLATFORMIO_CI_SRC=examples/LegoPowerFunctionsTests PLATFORMIO_BUILD_FLAGS="-DSEND_LEGO_PF"
-    - PLATFORMIO_CI_SRC=examples/IRremoteInfo 
-
 install:
     - pip install -U platformio
 
diff --git a/test.sh b/test.sh
index 7bc55a8..f993b70 100644
--- a/test.sh
+++ b/test.sh
@@ -1,15 +1,15 @@
-PLATFORMIO_CI_SRC=examples/AiwaRCT501SendDemo python2 -m platformio ci --lib="." --board=uno
-PLATFORMIO_CI_SRC=examples/IRrecord python2 -m platformio ci --lib="." --board=uno
-PLATFORMIO_CI_SRC=examples/IRrecvDemo python2 -m platformio ci --lib="." --board=uno
-PLATFORMIO_CI_SRC=examples/IRrecvDumpV2 python2 -m platformio ci --lib="." --board=uno
-PLATFORMIO_CI_SRC=examples/IRrelay python2 -m platformio ci --lib="." --board=uno
-PLATFORMIO_CI_SRC=examples/IRremoteInfo python2 -m platformio ci --lib="." --board=uno
-PLATFORMIO_CI_SRC=examples/IRsendDemo python2 -m platformio ci --lib="." --board=uno
-PLATFORMIO_CI_SRC=examples/IRsendRawDemo python2 -m platformio ci --lib="." --board=uno
-PLATFORMIO_CI_SRC=examples/IRtest python2 -m platformio ci --lib="." --board=uno
-PLATFORMIO_CI_SRC=examples/IRtest2 python2 -m platformio ci --lib="." --board=uno
-PLATFORMIO_CI_SRC=examples/JVCPanasonicSendDemo python2 -m platformio ci --lib="." --board=uno
-PLATFORMIO_CI_SRC=examples/LGACSendDemo python2 -m platformio ci --lib="." --board=uno
-PLATFORMIO_CI_SRC=examples/LegoPowerFunctionsSendDemo python2 -m platformio ci --lib="." --board=uno
-PLATFORMIO_CI_SRC=examples/LegoPowerFunctionsTests python2 -m platformio ci --lib="." --board=uno
+PLATFORMIO_CI_SRC=examples/AiwaRCT501SendDemo python2 -m platformio ci --lib="." --board=uno --board=leonardo --board=pro16MHzatmega168 --board=btatmega328 
+PLATFORMIO_CI_SRC=examples/IRrecord python2 -m platformio ci --lib="." --board=uno --board=leonardo --board=pro16MHzatmega168 --board=btatmega328 
+PLATFORMIO_CI_SRC=examples/IRrecvDemo python2 -m platformio ci --lib="." --board=uno --board=leonardo --board=pro16MHzatmega168 --board=btatmega328 
+PLATFORMIO_CI_SRC=examples/IRrecvDumpV2 python2 -m platformio ci --lib="." --board=uno --board=leonardo --board=pro16MHzatmega168 --board=btatmega328 
+PLATFORMIO_CI_SRC=examples/IRrelay python2 -m platformio ci --lib="." --board=uno --board=leonardo --board=pro16MHzatmega168 --board=btatmega328 
+PLATFORMIO_CI_SRC=examples/IRremoteInfo python2 -m platformio ci --lib="." --board=uno --board=leonardo --board=pro16MHzatmega168 --board=btatmega328 
+PLATFORMIO_CI_SRC=examples/IRsendDemo python2 -m platformio ci --lib="." --board=uno --board=leonardo --board=pro16MHzatmega168 --board=btatmega328 
+PLATFORMIO_CI_SRC=examples/IRsendRawDemo python2 -m platformio ci --lib="." --board=uno --board=leonardo --board=pro16MHzatmega168 --board=btatmega328 
+PLATFORMIO_CI_SRC=examples/IRtest python2 -m platformio ci --lib="." --board=uno --board=leonardo --board=pro16MHzatmega168 --board=btatmega328 
+PLATFORMIO_CI_SRC=examples/IRtest2 python2 -m platformio ci --lib="." --board=uno --board=leonardo --board=pro16MHzatmega168 --board=btatmega328 
+PLATFORMIO_CI_SRC=examples/JVCPanasonicSendDemo python2 -m platformio ci --lib="." --board=uno --board=leonardo --board=pro16MHzatmega168 --board=btatmega328 
+PLATFORMIO_CI_SRC=examples/LGACSendDemo python2 -m platformio ci --lib="." --board=uno --board=leonardo --board=pro16MHzatmega168 --board=btatmega328 
+PLATFORMIO_CI_SRC=examples/LegoPowerFunctionsSendDemo python2 -m platformio ci --lib="." --board=uno --board=leonardo --board=pro16MHzatmega168 --board=btatmega328 
+PLATFORMIO_CI_SRC=examples/LegoPowerFunctionsTests python2 -m platformio ci --lib="." --board=uno --board=leonardo --board=pro16MHzatmega168 --board=btatmega328