diff --git a/case-lib/hijack.sh b/case-lib/hijack.sh
index b8f43c1a..a489f982 100644
--- a/case-lib/hijack.sh
+++ b/case-lib/hijack.sh
@@ -2,7 +2,6 @@
 
 SUDO_CMD=$(command -v sudo)
 
-trap 'func_exit_handler $?' EXIT
 # Overwrite other functions' exit to perform environment cleanup
 function func_exit_handler()
 {
diff --git a/case-lib/lib.sh b/case-lib/lib.sh
index d80a9be8..1d9284ab 100644
--- a/case-lib/lib.sh
+++ b/case-lib/lib.sh
@@ -77,6 +77,9 @@ start_test()
         return 0
     }
 
+    # func_exit_handler() is in hijack.sh
+    trap 'func_exit_handler $?' EXIT
+
     if test -z "$MAX_WAIT_FW_LOADING"; then
         local _pltf; _pltf=$("$SCRIPT_HOME/tools/sof-dump-status.py" -p)
         case "$_pltf" in