diff --git a/test/test0021/hello-knight-posix.sh b/test/test0021/hello-knight-posix.sh
index 31c8303..d314de5 100755
--- a/test/test0021/hello-knight-posix.sh
+++ b/test/test0021/hello-knight-posix.sh
@@ -16,7 +16,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with M2-Planet.  If not, see <http://www.gnu.org/licenses/>.
 
-set -x
+set -ex
 
 TMPDIR="test/test0021/tmp-knight-posix"
 mkdir -p ${TMPDIR}
diff --git a/test/test0021/run_test.sh b/test/test0021/run_test.sh
index 53ef473..6b87260 100755
--- a/test/test0021/run_test.sh
+++ b/test/test0021/run_test.sh
@@ -16,7 +16,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with M2-Planet.  If not, see <http://www.gnu.org/licenses/>.
 
-set -x
+set -ex
 
 ARCH="$1"
 . test/env.inc.sh
diff --git a/test/test0022/hello-knight-posix.sh b/test/test0022/hello-knight-posix.sh
index ea9719e..34760a5 100755
--- a/test/test0022/hello-knight-posix.sh
+++ b/test/test0022/hello-knight-posix.sh
@@ -16,7 +16,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with M2-Planet.  If not, see <http://www.gnu.org/licenses/>.
 
-set -x
+set -ex
 
 TMPDIR="test/test0022/tmp-knight-posix"
 mkdir -p ${TMPDIR}
diff --git a/test/test0022/run_test.sh b/test/test0022/run_test.sh
index 6f11731..728a1d8 100755
--- a/test/test0022/run_test.sh
+++ b/test/test0022/run_test.sh
@@ -16,7 +16,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with M2-Planet.  If not, see <http://www.gnu.org/licenses/>.
 
-set -x
+set -ex
 
 ARCH="$1"
 . test/env.inc.sh
diff --git a/test/test0023/hello-knight-posix.sh b/test/test0023/hello-knight-posix.sh
index 4250a78..aa8afce 100755
--- a/test/test0023/hello-knight-posix.sh
+++ b/test/test0023/hello-knight-posix.sh
@@ -16,7 +16,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with M2-Planet.  If not, see <http://www.gnu.org/licenses/>.
 
-set -x
+set -ex
 
 TMPDIR="test/test0023/tmp-knight-posix"
 mkdir -p ${TMPDIR}
diff --git a/test/test0023/run_test.sh b/test/test0023/run_test.sh
index 62a3121..93a2daa 100755
--- a/test/test0023/run_test.sh
+++ b/test/test0023/run_test.sh
@@ -16,7 +16,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with M2-Planet.  If not, see <http://www.gnu.org/licenses/>.
 
-set -x
+set -ex
 
 ARCH="$1"
 . test/env.inc.sh
diff --git a/test/test0100/hello-knight-posix.sh b/test/test0100/hello-knight-posix.sh
index 87a497d..50b39d1 100755
--- a/test/test0100/hello-knight-posix.sh
+++ b/test/test0100/hello-knight-posix.sh
@@ -16,7 +16,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with M2-Planet.  If not, see <http://www.gnu.org/licenses/>.
 
-set -x
+set -ex
 
 TMPDIR="test/test0100/tmp-knight-posix"
 mkdir -p ${TMPDIR}
diff --git a/test/test0100/run_test.sh b/test/test0100/run_test.sh
index 7386c56..c3fd31f 100755
--- a/test/test0100/run_test.sh
+++ b/test/test0100/run_test.sh
@@ -16,7 +16,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with M2-Planet.  If not, see <http://www.gnu.org/licenses/>.
 
-set -x
+set -ex
 
 ARCH="$1"
 . test/env.inc.sh
diff --git a/test/test0101/hello-knight-posix.sh b/test/test0101/hello-knight-posix.sh
index de0eb4a..0af28a9 100755
--- a/test/test0101/hello-knight-posix.sh
+++ b/test/test0101/hello-knight-posix.sh
@@ -16,7 +16,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with M2-Planet.  If not, see <http://www.gnu.org/licenses/>.
 
-set -x
+set -ex
 
 TMPDIR="test/test0101/tmp-knight-posix"
 mkdir -p ${TMPDIR}
diff --git a/test/test0101/run_test.sh b/test/test0101/run_test.sh
index 3a09938..c94ed4a 100755
--- a/test/test0101/run_test.sh
+++ b/test/test0101/run_test.sh
@@ -16,7 +16,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with M2-Planet.  If not, see <http://www.gnu.org/licenses/>.
 
-set -x
+set -ex
 
 ARCH="$1"
 . test/env.inc.sh
diff --git a/test/test0102/hello-knight-posix.sh b/test/test0102/hello-knight-posix.sh
index d4ff6bd..6bb82e7 100755
--- a/test/test0102/hello-knight-posix.sh
+++ b/test/test0102/hello-knight-posix.sh
@@ -16,7 +16,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with M2-Planet.  If not, see <http://www.gnu.org/licenses/>.
 
-set -x
+set -ex
 
 TMPDIR="test/test0102/tmp-knight-posix"
 mkdir -p ${TMPDIR}
diff --git a/test/test0102/run_test.sh b/test/test0102/run_test.sh
index a27199b..8d43cb1 100755
--- a/test/test0102/run_test.sh
+++ b/test/test0102/run_test.sh
@@ -16,7 +16,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with M2-Planet.  If not, see <http://www.gnu.org/licenses/>.
 
-set -x
+set -ex
 
 ARCH="$1"
 . test/env.inc.sh
diff --git a/test/test0103/hello-knight-posix.sh b/test/test0103/hello-knight-posix.sh
index e568e1b..62bb0d7 100755
--- a/test/test0103/hello-knight-posix.sh
+++ b/test/test0103/hello-knight-posix.sh
@@ -16,7 +16,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with M2-Planet.  If not, see <http://www.gnu.org/licenses/>.
 
-set -x
+set -ex
 
 TMPDIR="test/test0103/tmp-knight-posix"
 mkdir -p ${TMPDIR}
diff --git a/test/test0103/run_test.sh b/test/test0103/run_test.sh
index ee61c4a..cc39376 100755
--- a/test/test0103/run_test.sh
+++ b/test/test0103/run_test.sh
@@ -16,7 +16,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with M2-Planet.  If not, see <http://www.gnu.org/licenses/>.
 
-set -x
+set -ex
 
 ARCH="$1"
 . test/env.inc.sh
diff --git a/test/test0104/run_test.sh b/test/test0104/run_test.sh
index 7ab2367..19cc25e 100755
--- a/test/test0104/run_test.sh
+++ b/test/test0104/run_test.sh
@@ -16,7 +16,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with M2-Planet.  If not, see <http://www.gnu.org/licenses/>.
 
-set -x
+set -ex
 
 ARCH="$1"
 . test/env.inc.sh
diff --git a/test/test0105/run_test.sh b/test/test0105/run_test.sh
index 60dba5c..48cb56e 100755
--- a/test/test0105/run_test.sh
+++ b/test/test0105/run_test.sh
@@ -16,7 +16,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with M2-Planet.  If not, see <http://www.gnu.org/licenses/>.
 
-set -x
+set -ex
 
 ARCH="$1"
 . test/env.inc.sh