diff --git a/.travis.yml b/.travis.yml
index 0464a5619e..928b867bc9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,26 @@
 language: cpp
 sudo: required
 
-before_install:
-  -  APMDIR=$(pwd) && pushd .. && $APMDIR/Tools/scripts/install-travis-env.sh -y && . ~/.profile && popd
+cache:
+  directories:
+    - $HOME/opt
 
-script: 
-  - Tools/scripts/build_all_travis.sh
+addons:
+  coverity_scan:
+    project:
+      name: "diydrones/ardupilot"
+      description: "Build submitted via Travis CI"
+    notification_email: andrew-scan@tridgell.net
+    build_command_prepend: "make clean"
+    build_command:   "make"
+    branch_pattern: coverity_scan
+
+before_install:
+  - APMDIR=$(pwd) && pushd .. && $APMDIR/Tools/scripts/configure-ci.sh && . ~/.profile && popd
+
+script:
+  - python Tools/autotest/param_metadata/param_parse.py
+  - Tools/scripts/build_ci.sh
 
 notifications:
   webhooks:
@@ -21,15 +36,5 @@ env:
     #   via the "travis encrypt" command using the project repo's public key
     - secure: "FjIwqZQV2FhNPWYITX5LZXTE38yYqBaQdbm3QmbEg/30wnPTm1ZOLIU7o/aSvX615ImR8kHoryvFPDQDWc6wWfqTEs3Ytq2kIvcIJS2Y5l/0PFfpWJoH5gRd6hDThnoi+1oVMLvj1+bhn4yFlCCQ2vT/jxoGfiQqqgvHtv4fLzI="
   matrix:
-    - TRAVIS_BUILD_TARGET="px4-v2"
-    - TRAVIS_BUILD_TARGET="sitl linux apm2 navio"
-
-addons:
-  coverity_scan:
-    project:
-      name: "diydrones/ardupilot"
-      description: "Build submitted via Travis CI"
-    notification_email: andrew-scan@tridgell.net
-    build_command_prepend: "make clean"
-    build_command:   "make"
-    branch_pattern: coverity_scan
+    - CI_BUILD_TARGET="px4-v2 sitl linux"
+    - CI_BUILD_TARGET="navio raspilot minlure bebop"