diff --git a/test.sh b/test.sh
index 838c4f7..38a7a3f 100755
--- a/test.sh
+++ b/test.sh
@@ -43,15 +43,11 @@ run_test_and_analyze_failed_logs() {
   set +o pipefail
   if [[ "$ret_code" != "0" ]]; then
     if [[ "${OS}" == "rhel8" ]] || [[ "${OS}" == "rhel9" ]] || [[ "${OS}" == "rhel10" ]]; then
-      set +e
       analyze_logs_by_logdetective "$tmp_file"
-      # Let's switch it back
-      set -e
     fi
   fi
   failed_version "$ret_code" "$dir"
   rm -f "$tmp_file"
-
 }
 # This adds backwards compatibility if only single version needs to be testing
 # In CI we would like to test single version but VERSIONS= means, that nothing is tested
@@ -87,7 +83,7 @@ for dir in ${VERSIONS}; do
       if [ -x test/run-openshift-remote-cluster ]; then
         run_test_and_analyze_failed_logs "test/run-openshift-remote-cluster"
       else
-        echo "-> Tests for OpenShift 4 are not present. Add run-openshift-remote-cluster script, skipping"
+        echo "-> Tests for OpenShift 4 for version $dir are not present. Add run-openshift-remote-cluster script, skipping"
       fi
     fi
 
@@ -97,7 +93,7 @@ for dir in ${VERSIONS}; do
     if [ -x test/run-upstream ]; then
       run_test_and_analyze_failed_logs "test/run-upstream"
     else
-      echo "-> Upstream tests are not present, skipping"
+      echo "-> Upstream tests for version $dir are not present, skipping"
     fi
   fi
 
@@ -105,7 +101,7 @@ for dir in ${VERSIONS}; do
     if [ -x test/run-openshift-pytest ]; then
       run_test_and_analyze_failed_logs "test/run-openshift-pytest"
     else
-      echo "-> OpenShift PyTest tests are not present, skipping"
+      echo "-> OpenShift PyTest tests for version $dir are not present, skipping"
     fi
   fi
 
@@ -113,7 +109,7 @@ for dir in ${VERSIONS}; do
     if [ -x test/run-pytest ]; then
       run_test_and_analyze_failed_logs "test/run-pytest"
     else
-      echo "-> PyTest tests are not present, skipping"
+      echo "-> PyTest tests for version $dir are not present, skipping"
     fi
   fi