diff --git a/continuous-build.sh b/continuous-build.sh
index 70a5f99..9675817 100755
--- a/continuous-build.sh
+++ b/continuous-build.sh
@@ -17,7 +17,7 @@ if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then
 		echo "Cannot find cross-compiling toolchain in $JEHANNE/hacking/bin"
 		if [ -f "$JEHANNE/tmp/toolchain/bin/x86_64-jehanne-gcc" ]; then
 			echo "Found cross-compiling toolchain in $JEHANNE/tmp/toolchain/"
-			mv $JEHANNE/tmp/toolchain/ $JEHANNE/hacking/cross/toolchain
+			mv $JEHANNE/tmp/toolchain/* $JEHANNE/hacking/cross/toolchain/
 		else
 			echo "Creating cross-compiling toolchain..."
 			(cd $JEHANNE/hacking/cross/; ./init.sh)
@@ -40,6 +40,9 @@ if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then
 
 	if [ "$TRAVIS_BUILD_DIR" != "" ]; then
 		echo "Move cross-compiling toolchain to $JEHANNE/tmp/toolchain for Travis caches"
-		mv $JEHANNE/hacking/cross/toolchain $JEHANNE/tmp/toolchain/
+		if [ ! -d "$JEHANNE/tmp/toolchain" ]; then
+			mkdir $JEHANNE/tmp/toolchain
+		fi
+		mv $JEHANNE/hacking/cross/toolchain/* $JEHANNE/tmp/toolchain/
 	fi
 fi
diff --git a/coverity-scan.sh b/coverity-scan.sh
index a6fd99f..e72d946 100755
--- a/coverity-scan.sh
+++ b/coverity-scan.sh
@@ -16,7 +16,7 @@ if [ ! -f "$JEHANNE/hacking/cross/toolchain/bin/x86_64-jehanne-gcc" ]; then
 	echo "Cannot find cross-compiling toolchain in $JEHANNE/hacking/bin"
 	if [ -f "$JEHANNE/tmp/toolchain/bin/x86_64-jehanne-gcc" ]; then
 		echo "Found cross-compiling toolchain in $JEHANNE/tmp/toolchain/"
-		mv $JEHANNE/tmp/toolchain/ $JEHANNE/hacking/cross/toolchain
+		mv $JEHANNE/tmp/toolchain/* $JEHANNE/hacking/cross/toolchain/
 	else
 		echo "Creating cross-compiling toolchain..."
 		(cd $JEHANNE/hacking/cross/; ./init.sh)
@@ -32,5 +32,8 @@ build all
 
 if [ "$TRAVIS_BUILD_DIR" != "" ]; then
 	echo "Move cross-compiling toolchain to $JEHANNE/tmp/toolchain for Travis caches"
-	mv $JEHANNE/hacking/cross/toolchain $JEHANNE/tmp/toolchain/
+	if [ ! -d "$JEHANNE/tmp/toolchain" ]; then
+		mkdir $JEHANNE/tmp/toolchain
+	fi
+	mv $JEHANNE/hacking/cross/toolchain/* $JEHANNE/tmp/toolchain/
 fi