diff --git a/tools/build_debian.sh b/tools/build_debian.sh
index 67a3c8b07..f8a641368 100755
--- a/tools/build_debian.sh
+++ b/tools/build_debian.sh
@@ -53,8 +53,7 @@
 #                   (numeric or "auto" for dpkg >= 1.17.10)
 #
 
-# exit on any error
-set -e
+set -o errexit
 
 # default values for options from environment variables
 DEFAULT_PACKAGER_NAME="Sébastien Helleu"
diff --git a/tools/build_test.sh b/tools/build_test.sh
index 273519d96..b401a2bcd 100755
--- a/tools/build_test.sh
+++ b/tools/build_test.sh
@@ -31,8 +31,7 @@
 # This script is used to build WeeChat in CI environment.
 #
 
-# exit on any error
-set -e
+set -o errexit
 
 BUILDDIR="build-tmp-$$"
 
diff --git a/tools/check_scripts.sh b/tools/check_scripts.sh
index 52845e8df..97e8b2754 100755
--- a/tools/check_scripts.sh
+++ b/tools/check_scripts.sh
@@ -24,8 +24,7 @@
 #  - Python scripts: flake8 + pylint + bandit
 #
 
-# exit on any error
-set -e
+set -o errexit
 
 # check git repository
 ROOT_DIR=$(git rev-parse --show-toplevel)
diff --git a/tools/makedist.sh b/tools/makedist.sh
index 6369e5df2..dcb6226d4 100755
--- a/tools/makedist.sh
+++ b/tools/makedist.sh
@@ -33,8 +33,7 @@
 #             defaults to current directory
 #
 
-# exit on any error
-set -e
+set -o errexit
 
 error ()
 {