diff --git a/Runner/suites/Kernel/Baseport/adsp_remoteproc/run.sh b/Runner/suites/Kernel/Baseport/adsp_remoteproc/run.sh
index 2b1f209c..d19d1a77 100755
--- a/Runner/suites/Kernel/Baseport/adsp_remoteproc/run.sh
+++ b/Runner/suites/Kernel/Baseport/adsp_remoteproc/run.sh
@@ -27,14 +27,14 @@ fi
 # Always source functestlib.sh, using $TOOLS exported by init_env
 # shellcheck disable=SC1090,SC1091
 . "$TOOLS/functestlib.sh"
- 
+
 TESTNAME="adsp_remoteproc"
 RES_FILE="./$TESTNAME.res"
 FW="adsp"
 
 test_path=$(find_test_case_by_name "$TESTNAME")
 cd "$test_path" || exit 1
- 
+
 log_info "-----------------------------------------------------------------------------------------"
 log_info "------------------- Starting $TESTNAME Testcase ----------------------------"
 log_info "=== Test Initialization ==="
@@ -59,7 +59,8 @@ fi
 # get_remoteproc_by_firmware prints: "path|state|firmware|name"
 entries="$(get_remoteproc_by_firmware "$FW" "" all)" || entries=""
 if [ -z "$entries" ]; then
-    fail_and_exit "$FW present in DT but no /sys/class/remoteproc entry found"
+    log_fail "$FW present in DT but no /sys/class/remoteproc entry found"
+    exit 1
 fi
 
 count_instances=$(printf '%s\n' "$entries" | wc -l)
diff --git a/Runner/suites/Kernel/Baseport/cdsp_remoteproc/run.sh b/Runner/suites/Kernel/Baseport/cdsp_remoteproc/run.sh
index cb53922a..ed3144d1 100755
--- a/Runner/suites/Kernel/Baseport/cdsp_remoteproc/run.sh
+++ b/Runner/suites/Kernel/Baseport/cdsp_remoteproc/run.sh
@@ -28,14 +28,14 @@ fi
 # Always source functestlib.sh, using $TOOLS exported by init_env
 # shellcheck disable=SC1090,SC1091
 . "$TOOLS/functestlib.sh"
- 
+
 TESTNAME="cdsp_remoteproc"
 RES_FILE="./$TESTNAME.res"
 FW="cdsp"
 
 test_path=$(find_test_case_by_name "$TESTNAME")
 cd "$test_path" || exit 1
- 
+
 log_info "-----------------------------------------------------------------------------------------"
 log_info "------------------- Starting $TESTNAME Testcase ----------------------------"
 log_info "=== Test Initialization ==="
@@ -60,7 +60,8 @@ fi
 # get_remoteproc_by_firmware prints: "path|state|firmware|name"
 entries="$(get_remoteproc_by_firmware "$FW" "" all)" || entries=""
 if [ -z "$entries" ]; then
-    fail_and_exit "$FW present in DT but no /sys/class/remoteproc entry found"
+    log_fail "$FW present in DT but no /sys/class/remoteproc entry found"
+    exit 1
 fi
 
 count_instances=$(printf '%s\n' "$entries" | wc -l)
diff --git a/Runner/suites/Kernel/Baseport/gpdsp_remoteproc/run.sh b/Runner/suites/Kernel/Baseport/gpdsp_remoteproc/run.sh
index 2186555e..d19d60bd 100755
--- a/Runner/suites/Kernel/Baseport/gpdsp_remoteproc/run.sh
+++ b/Runner/suites/Kernel/Baseport/gpdsp_remoteproc/run.sh
@@ -28,14 +28,14 @@ fi
 # Always source functestlib.sh, using $TOOLS exported by init_env
 # shellcheck disable=SC1090,SC1091
 . "$TOOLS/functestlib.sh"
- 
+
 TESTNAME="gpdsp_remoteproc"
 RES_FILE="./$TESTNAME.res"
 FW="gpdsp"
 
 test_path=$(find_test_case_by_name "$TESTNAME")
 cd "$test_path" || exit 1
- 
+
 log_info "-----------------------------------------------------------------------------------------"
 log_info "------------------- Starting $TESTNAME Testcase ----------------------------"
 log_info "=== Test Initialization ==="
diff --git a/Runner/suites/Kernel/Baseport/wpss_remoteproc/run.sh b/Runner/suites/Kernel/Baseport/wpss_remoteproc/run.sh
index 05faaa4a..306b6ad8 100755
--- a/Runner/suites/Kernel/Baseport/wpss_remoteproc/run.sh
+++ b/Runner/suites/Kernel/Baseport/wpss_remoteproc/run.sh
@@ -2,6 +2,7 @@
 
 # Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
 # SPDX-License-Identifier: BSD-3-Clause-Clear
+#
 # Robustly find and source init_env
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 INIT_ENV=""
@@ -27,7 +28,7 @@ fi
 # Always source functestlib.sh, using $TOOLS exported by init_env
 # shellcheck disable=SC1090,SC1091
 . "$TOOLS/functestlib.sh"
- 
+
 TESTNAME="wpss_remoteproc"
 FW="wpss"
 RES_FILE="./$TESTNAME.res"
@@ -174,7 +175,9 @@ else
     else
         # If DT said WPSS present but neither remoteproc nor driver -> FAIL
         if [ "$dt_says_present" -eq 1 ]; then
-            fail_and_exit "DT lists $FW but no remoteproc and ath11k not loaded"
+            log_fail "DT lists $FW but no remoteproc and ath11k not loaded"
+            echo "$TESTNAME FAIL" >"$RES_FILE"
+            exit 1
         fi
         log_skip "$TESTNAME SKIP – neither remoteproc nor ath11k path available"
         echo "$TESTNAME SKIP" >"$RES_FILE"
@@ -200,6 +203,7 @@ if [ -e "$1" ]; then
 else
     log_info "No wlan interface yet (maybe not brought up)"
 fi
+
 # Final result for driver path: PASS if we got here
 log_pass "WPSS driver path checks passed"
 echo "$TESTNAME PASS" >"$RES_FILE"