diff --git a/ceph-client/templates/bin/_helm-tests.sh.tpl b/ceph-client/templates/bin/_helm-tests.sh.tpl
index 5b852b332..ba4528dcc 100755
--- a/ceph-client/templates/bin/_helm-tests.sh.tpl
+++ b/ceph-client/templates/bin/_helm-tests.sh.tpl
@@ -16,6 +16,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */}}
 
+set -ex
+
 function check_cluster_status() {
   echo "#### Start: Checking Ceph cluster status ####"
   ceph_status_output=$(ceph -s -f json | jq -r '.health')
diff --git a/ceph-osd/templates/bin/_helm-tests.sh.tpl b/ceph-osd/templates/bin/_helm-tests.sh.tpl
index a36f88ac1..3527614f2 100644
--- a/ceph-osd/templates/bin/_helm-tests.sh.tpl
+++ b/ceph-osd/templates/bin/_helm-tests.sh.tpl
@@ -16,6 +16,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */}}
 
+set -ex
+
 # Check OSD status
 function check_osd_status() {
   echo "--Start: Checking OSD status--"