diff --git a/Tools/scripts/build_all.sh b/Tools/scripts/build_all.sh
index 19b7d6ce734..468002a15d3 100755
--- a/Tools/scripts/build_all.sh
+++ b/Tools/scripts/build_all.sh
@@ -8,6 +8,9 @@
 set -e
 set -x
 
+export BUILDROOT="/tmp/all.build"
+rm -rf $BUILDROOT
+
 echo "Testing ArduPlane build"
 pushd ArduPlane
 for b in sitl linux; do
diff --git a/Tools/scripts/build_binaries.sh b/Tools/scripts/build_binaries.sh
index 1b06f3688ac..7edfc393e46 100755
--- a/Tools/scripts/build_binaries.sh
+++ b/Tools/scripts/build_binaries.sh
@@ -170,7 +170,7 @@ build_arduplane() {
             continue
         }
         extension=$(board_extension $b)
-	copyit $TMPDIR/ArduPlane.build/ArduPlane.$extension $ddir $tag
+	copyit $BUILDROOT/ArduPlane.$extension $ddir $tag
 	touch $binaries/Plane/$tag
     done
     echo "Building ArduPlane PX4 binaries"
@@ -226,7 +226,7 @@ build_arducopter() {
                 continue
             }
             extension=$(board_extension $b)
-	    copyit $TMPDIR/ArduCopter.build/ArduCopter.$extension $ddir $tag
+	    copyit $BUILDROOT/ArduCopter.$extension $ddir $tag
 	    touch $binaries/Copter/$tag
         done
     done
@@ -270,7 +270,7 @@ build_rover() {
             continue
         }
         extension=$(board_extension $b)
-	copyit $TMPDIR/APMrover2.build/APMrover2.$extension $ddir $tag
+	copyit $BUILDROOT/APMrover2.$extension $ddir $tag
 	touch $binaries/Rover/$tag
     done
     echo "Building APMrover2 PX4 binaries"
@@ -312,7 +312,7 @@ build_antennatracker() {
             continue
         }
         extension=$(board_extension $b)
-	copyit $TMPDIR/AntennaTracker.build/AntennaTracker.$extension $ddir $tag
+	copyit $BUILDROOT/AntennaTracker.$extension $ddir $tag
 	touch $binaries/AntennaTracker/$tag
     done
     echo "Building AntennaTracker PX4 binaries"
@@ -342,6 +342,9 @@ build_antennatracker() {
     git submodule update
 }
 
+export BUILDROOT="$TMPDIR/binaries.build"
+rm -rf $BUILDROOT
+
 # make sure PX4 is rebuilt from scratch
 for d in ArduPlane ArduCopter APMrover2 AntennaTracker; do
          pushd $d