diff --git a/Tools/scripts/build_all.sh b/Tools/scripts/build_all.sh
index ad2f056b09..77b28530f9 100755
--- a/Tools/scripts/build_all.sh
+++ b/Tools/scripts/build_all.sh
@@ -19,7 +19,7 @@ popd
 
 echo "Testing ArduCopter build"
 pushd ArduCopter
-for b in all apm2 apm1-hil apm2-hil sitl heli dmp linux; do
+for b in all apm2 apm1-hil apm2-hil sitl apm2-heli linux; do
     pwd
     make clean
     make $b -j4
diff --git a/Tools/scripts/build_binaries.sh b/Tools/scripts/build_binaries.sh
index 0ca4c4a844..36fa7840a5 100755
--- a/Tools/scripts/build_binaries.sh
+++ b/Tools/scripts/build_binaries.sh
@@ -118,8 +118,9 @@ build_arducopter() {
     checkout ArduCopter $tag || return
     echo "Building ArduCopter $tag binaries"
     pushd ArduCopter
+    frames="quad tri hexa y6 octa octa-quad heli"
     for b in apm1 apm2; do
-	for f in quad tri hexa y6 octa octa-quad heli quad-hil heli-hil; do
+	for f in $frames quad-hil heli-hil; do
 	    echo "Building ArduCopter $b-$f binaries"
 	    ddir="$binaries/Copter/$hdate/$b-$f"
 	    skip_build $tag $ddir && continue
@@ -131,7 +132,7 @@ build_arducopter() {
     done
     test -n "$PX4_ROOT" && {
 	make px4-clean || return
-	for f in quad tri hexa y6 octa octa-quad heli quad-hil heli-hil; do
+	for f in $frames quad-hil heli-hil; do
 	    echo "Building ArduCopter PX4-$f binaries"
 	    ddir="$binaries/Copter/$hdate/PX4-$f"
 	    skip_build $tag $ddir && continue