diff --git a/tests/cli/test_blueprints_sanity.sh b/tests/cli/test_blueprints_sanity.sh
index b62eacd8..46b0e0b7 100755
--- a/tests/cli/test_blueprints_sanity.sh
+++ b/tests/cli/test_blueprints_sanity.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 # Note: execute this file from the project root directory
 
+set -e
+
 . /usr/share/beakerlib/beakerlib.sh
 
 CLI="${CLI:-./src/bin/composer-cli}"
diff --git a/tests/cli/test_build_and_deploy_aws.sh b/tests/cli/test_build_and_deploy_aws.sh
index 5db22306..1d417625 100755
--- a/tests/cli/test_build_and_deploy_aws.sh
+++ b/tests/cli/test_build_and_deploy_aws.sh
@@ -7,6 +7,8 @@
 #
 #####
 
+set -e
+
 . /usr/share/beakerlib/beakerlib.sh
 . $(dirname $0)/lib/lib.sh
 
diff --git a/tests/cli/test_build_and_deploy_azure.sh b/tests/cli/test_build_and_deploy_azure.sh
index e408d6a5..7dbe27d9 100755
--- a/tests/cli/test_build_and_deploy_azure.sh
+++ b/tests/cli/test_build_and_deploy_azure.sh
@@ -7,6 +7,8 @@
 #
 #####
 
+set -e
+
 . /usr/share/beakerlib/beakerlib.sh
 . $(dirname $0)/lib/lib.sh
 
diff --git a/tests/cli/test_build_and_deploy_openstack.sh b/tests/cli/test_build_and_deploy_openstack.sh
index 75167ccc..07ca100c 100755
--- a/tests/cli/test_build_and_deploy_openstack.sh
+++ b/tests/cli/test_build_and_deploy_openstack.sh
@@ -7,6 +7,8 @@
 #
 #####
 
+set -e
+
 . /usr/share/beakerlib/beakerlib.sh
 . $(dirname $0)/lib/lib.sh
 
diff --git a/tests/cli/test_build_and_deploy_vmware.sh b/tests/cli/test_build_and_deploy_vmware.sh
index ec13cc4a..40ffeada 100755
--- a/tests/cli/test_build_and_deploy_vmware.sh
+++ b/tests/cli/test_build_and_deploy_vmware.sh
@@ -7,6 +7,8 @@
 #
 #####
 
+set -e
+
 . /usr/share/beakerlib/beakerlib.sh
 . $(dirname $0)/lib/lib.sh
 
diff --git a/tests/cli/test_compose_ext4-filesystem.sh b/tests/cli/test_compose_ext4-filesystem.sh
index 6b321dac..b968f8d9 100755
--- a/tests/cli/test_compose_ext4-filesystem.sh
+++ b/tests/cli/test_compose_ext4-filesystem.sh
@@ -9,6 +9,8 @@
 #
 #####
 
+set -e
+
 . /usr/share/beakerlib/beakerlib.sh
 
 CLI="${CLI:-./src/bin/composer-cli}"
diff --git a/tests/cli/test_compose_google.sh b/tests/cli/test_compose_google.sh
index a8411bab..bfe8ca54 100755
--- a/tests/cli/test_compose_google.sh
+++ b/tests/cli/test_compose_google.sh
@@ -6,6 +6,8 @@
 #
 #####
 
+set -e
+
 . /usr/share/beakerlib/beakerlib.sh
 
 CLI="${CLI:-./src/bin/composer-cli}"
diff --git a/tests/cli/test_compose_live-iso.sh b/tests/cli/test_compose_live-iso.sh
index df4d1976..596ce118 100755
--- a/tests/cli/test_compose_live-iso.sh
+++ b/tests/cli/test_compose_live-iso.sh
@@ -7,6 +7,8 @@
 #
 #####
 
+set -e
+
 . /usr/share/beakerlib/beakerlib.sh
 . $(dirname $0)/lib/lib.sh
 
diff --git a/tests/cli/test_compose_partitioned-disk.sh b/tests/cli/test_compose_partitioned-disk.sh
index b7206392..9f01425e 100755
--- a/tests/cli/test_compose_partitioned-disk.sh
+++ b/tests/cli/test_compose_partitioned-disk.sh
@@ -9,6 +9,8 @@
 #
 #####
 
+set -e
+
 . /usr/share/beakerlib/beakerlib.sh
 
 CLI="${CLI:-./src/bin/composer-cli}"
diff --git a/tests/cli/test_compose_qcow2.sh b/tests/cli/test_compose_qcow2.sh
index 6e14c8cb..9afe9a34 100755
--- a/tests/cli/test_compose_qcow2.sh
+++ b/tests/cli/test_compose_qcow2.sh
@@ -7,6 +7,8 @@
 #
 #####
 
+set -e
+
 . /usr/share/beakerlib/beakerlib.sh
 . $(dirname $0)/lib/lib.sh
 
diff --git a/tests/cli/test_compose_sanity.sh b/tests/cli/test_compose_sanity.sh
index 0f200d68..f6716734 100755
--- a/tests/cli/test_compose_sanity.sh
+++ b/tests/cli/test_compose_sanity.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 # Note: execute this file from the project root directory
 
+set -e
+
 . /usr/share/beakerlib/beakerlib.sh
 
 CLI="${CLI:-./src/bin/composer-cli}"
diff --git a/tests/cli/test_compose_tar.sh b/tests/cli/test_compose_tar.sh
index 18e7328f..f54ea4bd 100755
--- a/tests/cli/test_compose_tar.sh
+++ b/tests/cli/test_compose_tar.sh
@@ -7,6 +7,8 @@
 #
 #####
 
+set -e
+
 . /usr/share/beakerlib/beakerlib.sh
 
 CLI="${CLI:-./src/bin/composer-cli}"
diff --git a/tests/test_cli.sh b/tests/test_cli.sh
index 9395a277..2d098cba 100755
--- a/tests/test_cli.sh
+++ b/tests/test_cli.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 # Note: execute this file from the project root directory
 
+set -eu
+
 # setup
 rm -rf /var/tmp/beakerlib-*/