diff --git a/.gitlab-ci/lava/utils/ssh_job_definition.py b/.gitlab-ci/lava/utils/ssh_job_definition.py
index 04d2f2af029..b486952f443 100644
--- a/.gitlab-ci/lava/utils/ssh_job_definition.py
+++ b/.gitlab-ci/lava/utils/ssh_job_definition.py
@@ -68,7 +68,7 @@ EOF
 ping -c 5 -w 60 $(lava-target-ip)
 
 lava_ssh_test_case() {
-    set -x
+    set -ex
     local test_case="${1}"
     shift
     lava-test-case \"${test_case}\" --shell \\
diff --git a/.pick_status.json b/.pick_status.json
index 5583e13c98c..6ff174b60c8 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -644,7 +644,7 @@
         "description": "ci/lava: Propagate errors in SSH tests",
         "nominated": false,
         "nomination_type": 0,
-        "resolution": 4,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null