diff --git a/.travis.yml b/.travis.yml
index 4b796cf..3800e56 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,20 +9,19 @@ cache:
         - "~/.platformio"
 
 env:
-    - PLATFORMIO_CI_SRC=examples/BlynkClient PLATFORMIO_CI_ARGS="--board=leonardo"
-    - PLATFORMIO_CI_SRC=examples/FileDownload PLATFORMIO_CI_ARGS="--board=leonardo"
-    - PLATFORMIO_CI_SRC=examples/MqttClient PLATFORMIO_CI_ARGS="--board=leonardo"
-    - PLATFORMIO_CI_SRC=examples/WebClient PLATFORMIO_CI_ARGS="--board=leonardo"
-    - PLATFORMIO_CI_SRC=tools/SimpleTest PLATFORMIO_CI_ARGS="--board=leonardo"
-    - PLATFORMIO_CI_SRC=tools/FactoryReset PLATFORMIO_CI_ARGS="--board=leonardo"
-    - PLATFORMIO_CI_SRC=tools/AT_Debug PLATFORMIO_CI_ARGS="--board=leonardo"
+    - PLATFORMIO_CI_SRC=examples/BlynkClient
+    - PLATFORMIO_CI_SRC=examples/FileDownload
+    - PLATFORMIO_CI_SRC=examples/MqttClient
+    - PLATFORMIO_CI_SRC=examples/WebClient
+    - PLATFORMIO_CI_SRC=tools/SimpleTest
+    - PLATFORMIO_CI_SRC=tools/FactoryReset
+    - PLATFORMIO_CI_SRC=tools/AT_Debug
 
     # Arduino test
-    - PLATFORMIO_CI_SRC=extras/test_build PLATFORMIO_CI_ARGS="--board=uno --board=leonardo --board=yun --board=megaatmega2560 --board=genuino101 --board=mkr1000USB --board=zero --board=teensy31 --board=uno_pic32 --board=esp01 --board=nodemcuv2 --board=esp32dev"
-    - PLATFORMIO_CI_SRC=extras/test_build PLATFORMIO_CI_ARGS='--board=bluepill_f103c8 --project-option="framework=arduino"'
+    - PLATFORMIO_CI_SRC=extras/test_build PLATFORMIO_CI_ARGS="--project-option='framework=arduino' --board=uno --board=leonardo --board=yun --board=megaatmega2560 --board=genuino101 --board=mkr1000USB --board=zero --board=teensy31 --board=bluepill_f103c8 --board=uno_pic32 --board=esp01 --board=nodemcuv2 --board=esp32dev"
 
     # Energia test
-    - PLATFORMIO_CI_SRC=extras/test_build PLATFORMIO_CI_ARGS='--board=lplm4f120h5qr --project-option="framework=energia"'
+    - PLATFORMIO_CI_SRC=extras/test_build PLATFORMIO_CI_ARGS="--project-option='framework=energia' --board=lplm4f120h5qr"
 
 install:
     # ChipKIT issue: install 32-bit support for GCC PIC32
@@ -40,5 +39,4 @@ install:
 
     - platformio lib -g install 89 415 1202 1286
 
-script:
-    - platformio ci --lib="." $PLATFORMIO_CI_ARGS
+script: make travis-build
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..40cbd82
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,9 @@
+.PHONY: travis-build
+
+travis-build:
+ifdef PLATFORMIO_CI_ARGS
+	platformio ci --lib="." $(PLATFORMIO_CI_ARGS)
+else
+	platformio ci --lib="." --board=leonardo
+endif
+