diff --git a/assets/build/functions.sh b/assets/build/functions.sh
index 7e79d6a..8ff6f00 100755
--- a/assets/build/functions.sh
+++ b/assets/build/functions.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
-set -e
+set -o errexit
+set -o pipefail
 
 #---  FUNCTION  -------------------------------------------------------------------------------------------------------
 #          NAME:  log_debug
diff --git a/assets/build/install.sh b/assets/build/install.sh
index 9899302..7b76fc9 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
-set -e
+set -o errexit
+set -o pipefail
 
 export DEBIAN_FRONTEND=noninteractive
 
diff --git a/assets/runtime/functions.sh b/assets/runtime/functions.sh
index 598eeef..7c75a84 100755
--- a/assets/runtime/functions.sh
+++ b/assets/runtime/functions.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
-set -e
+set -o errexit
+set -o pipefail
 
 # shellcheck source=assets/runtime/env-defaults.sh
 ENV_DEFAULTS_FILE="${SALT_RUNTIME_DIR}/env-defaults.sh"
diff --git a/entrypoint.sh b/entrypoint.sh
index 67b2482..b49e39c 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -7,7 +7,7 @@ set -o pipefail
 FUNCTIONS_FILE="${SALT_RUNTIME_DIR}/functions.sh"
 source "${FUNCTIONS_FILE}"
 
-[[ "${DEBUG,,}" == true ]] && set -x
+[[ "${DEBUG,,}" == true ]] && set -o xtrace
 
 case "${1}" in
   app:start|app:gen-signed-keys)
@@ -35,7 +35,7 @@ case "${1}" in
         exec supervisorctl restart "${1}"
         ;;
       *)
-        log_error "Unable to restart ${1} serice. Service is unknown"
+        log_error "Unable to restart ${1} service. Service is unknown"
         exit 1
         ;;
     esac
diff --git a/tests/basic/test.sh b/tests/basic/test.sh
index f941d50..3f03a96 100755
--- a/tests/basic/test.sh
+++ b/tests/basic/test.sh
@@ -1,8 +1,5 @@
 #!/usr/bin/env bash
 
-set -e
-[ "${DEBUG,,}" == true ] && set -vx
-
 echo "🧪 Running basic tests ..."
 
 # https://stackoverflow.com/a/4774063/3398062
diff --git a/tests/config-reloader/test.sh b/tests/config-reloader/test.sh
index a4c10a5..c8f6a41 100755
--- a/tests/config-reloader/test.sh
+++ b/tests/config-reloader/test.sh
@@ -1,8 +1,5 @@
 #!/usr/bin/env bash
 
-set -e
-[ "${DEBUG,,}" == true ] && set -vx
-
 echo "🧪 Running config-reloader tests ..."
 
 # https://stackoverflow.com/a/4774063/3398062
diff --git a/tests/gitfs/test.sh b/tests/gitfs/test.sh
index b10eadd..c20f560 100755
--- a/tests/gitfs/test.sh
+++ b/tests/gitfs/test.sh
@@ -1,8 +1,5 @@
 #!/usr/bin/env bash
 
-set -e
-[ "${DEBUG,,}" == true ] && set -vx
-
 echo "🧪 Running gitfs tests ..."
 
 # https://stackoverflow.com/a/4774063/3398062
diff --git a/tests/lib/common.sh b/tests/lib/common.sh
index e51cac0..80b4146 100644
--- a/tests/lib/common.sh
+++ b/tests/lib/common.sh
@@ -1,5 +1,13 @@
 #!/usr/bin/env bash
 
+set -o errexit
+set -o pipefail
+
+if [[ "${DEBUG,,}" == true ]]; then
+  set -o verbose
+  set -o xtrace
+fi
+
 #---  ENV VARIABLE  ---------------------------------------------------------------------------------------------------
 #          NAME:  IMAGE_NAME
 #   DESCRIPTION:  The name and tag of the Docker image. Default: 'cdalvaro/docker-salt-master:latest'.
diff --git a/tests/salt-api/test.sh b/tests/salt-api/test.sh
index 3ea13f9..31f01a9 100755
--- a/tests/salt-api/test.sh
+++ b/tests/salt-api/test.sh
@@ -1,8 +1,5 @@
 #!/usr/bin/env bash
 
-set -e
-[ "${DEBUG,,}" == true ] && set -vx
-
 echo "🧪 Running salt-api tests ..."
 
 # https://stackoverflow.com/a/4774063/3398062