diff --git a/buildtools.sh b/buildtools.sh
index afbc9f0..84e6dc5 100755
--- a/buildtools.sh
+++ b/buildtools.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 cd `dirname $0`
 if [ -z "$UTILITIES" ]; then
 	UTILITIES=`pwd`
diff --git a/continuous-build.sh b/continuous-build.sh
index a7bba35..3bac917 100755
--- a/continuous-build.sh
+++ b/continuous-build.sh
@@ -2,12 +2,15 @@
 set -e
 
 if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then
-	export JEHANNE=`git rev-parse --show-toplevel|sed 's/\/hacking//g'`
+	cd `dirname $0`
+	export JEHANNE=`pwd`
 	export PATH="$JEHANNE/hacking/bin:$PATH"
 	export SH=`which rc`
 	export ARCH=amd64
 	git clean -x -d -f
-	(cd $JEHANNE && ./hacking/buildtools.sh)
+	if [ ! -f "$JEHANNE/hacking/bin/ufs" ]; then
+		./hacking/buildtools.sh
+	fi
 
 	echo
 	echo "Vendorized code verification..."
diff --git a/coverity-scan.sh b/coverity-scan.sh
deleted file mode 100755
index 4054122..0000000
--- a/coverity-scan.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-set -e
-
-if [ "${COVERITY_SCAN_BRANCH}" == "1" ]; then
-	if [ -z "$JEHANNE" ]; then
-		export JEHANNE=`git rev-parse --show-toplevel|sed 's/\/hacking//g'`
-		export PATH="$JEHANNE/hacking/bin:$PATH"
-	fi
-	export SH=`which rc`
-	export ARCH=amd64
-	git clean -x -d -f
-	(cd $JEHANNE && ./hacking/buildtools.sh)
-
-	cd $JEHANNE
-	build
-fi