diff --git a/.travis.yml b/.travis.yml
index eb1d9e0b72..397de83714 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -60,16 +60,13 @@ matrix:
   include:
     - if: type != cron
       compiler: "gcc"
-      env: CI_BUILD_TARGET="revo-bootloader periph-build CubeOrange-bootloader iofirmware stm32f7 stm32h7 fmuv2-plane"
+      env: CI_BUILD_TARGET="stm32f7 stm32h7 fmuv2-plane"
     - if: type != cron
       compiler: "gcc"
       env: CI_BUILD_TARGET="sitltest-copter"
     - if: type != cron
       compiler: "gcc"
       env: CI_BUILD_TARGET="sitltest-quadplane sitltest-plane"
-    - if: type != cron
-      compiler: "clang-7"
-      env: CI_BUILD_TARGET="sitltest-rover sitltest-sub sitltest-balancebot"
     - if: type != cron
       compiler: "gcc"
       env: CI_BUILD_TARGET="unit-tests"
diff --git a/Tools/scripts/build_ci.sh b/Tools/scripts/build_ci.sh
index 37ff0ec696..777b9d94f7 100755
--- a/Tools/scripts/build_ci.sh
+++ b/Tools/scripts/build_ci.sh
@@ -171,7 +171,8 @@ for t in $CI_BUILD_TARGET; do
                 --check-c-compiler="$c_compiler" \
                 --check-cxx-compiler="$cxx_compiler"
         $waf clean
-        $waf all
+        $waf copter
+        $waf plane
         ccache -s && ccache -z
 
         if [[ $t == linux ]]; then
@@ -180,11 +181,8 @@ for t in $CI_BUILD_TARGET; do
     fi
 done
 
-python Tools/autotest/param_metadata/param_parse.py --vehicle APMrover2
-python Tools/autotest/param_metadata/param_parse.py --vehicle AntennaTracker
 python Tools/autotest/param_metadata/param_parse.py --vehicle ArduCopter
 python Tools/autotest/param_metadata/param_parse.py --vehicle ArduPlane
-python Tools/autotest/param_metadata/param_parse.py --vehicle ArduSub
 
 echo build OK
 exit 0