diff --git a/module/scmi_perf/test/protocol/mod_scmi_perf_protocol_ops.cmake b/module/scmi_perf/test/protocol/mod_scmi_perf_protocol_ops.cmake
index 60f48debfc93f7f7f1dddc694ff138e3b3896a45..88593deb0214830906d0f38f6dacf7fb8294ee43 100644
--- a/module/scmi_perf/test/protocol/mod_scmi_perf_protocol_ops.cmake
+++ b/module/scmi_perf/test/protocol/mod_scmi_perf_protocol_ops.cmake
@@ -41,8 +41,6 @@ include(${SCP_ROOT}/unit_test/module_common.cmake)
 target_compile_definitions(${UNIT_TEST_TARGET} PUBLIC
     "BUILD_HAS_SCMI_PERF_PROTOCOL_OPS")
 target_compile_definitions(${UNIT_TEST_TARGET} PUBLIC
-    "BUILD_HAS_SCMI_PERF_FAST_CHANNELS"
-    "BUILD_HAS_FAST_CHANNELS"
     "BUILD_HAS_MOD_TRANSPORT")
 #
 # BUILD_HAS_SCMI_PERF_FAST_CHANNELS target
diff --git a/module/scmi_perf/test/protocol/mod_scmi_perf_protocol_ops_unit_test.c b/module/scmi_perf/test/protocol/mod_scmi_perf_protocol_ops_unit_test.c
index c39bb91a47020a13c8465c3964da139716165c32..1e4541a3a5f8edc6e822bbe1fcde09e142681396 100644
--- a/module/scmi_perf/test/protocol/mod_scmi_perf_protocol_ops_unit_test.c
+++ b/module/scmi_perf/test/protocol/mod_scmi_perf_protocol_ops_unit_test.c
@@ -986,6 +986,8 @@ void utest_scmi_perf_message_handler_bad_message_id(void)
     mod_scmi_from_protocol_api_scmi_frame_validation_ExpectAnyArgsAndReturn(
         SCMI_NOT_SUPPORTED);
 
+    return_status = SCMI_NOT_SUPPORTED;
+
     status = scmi_perf_message_handler(
         (fwk_id_t)MOD_SCMI_PROTOCOL_ID_PERF,
         service_id,
@@ -1009,6 +1011,8 @@ void utest_scmi_perf_message_handler_not_found(void)
     mod_scmi_from_protocol_api_scmi_frame_validation_ExpectAnyArgsAndReturn(
         SCMI_NOT_FOUND);
 
+    return_status = SCMI_NOT_FOUND;
+
     status = scmi_perf_message_handler(
         (fwk_id_t)MOD_SCMI_PROTOCOL_ID_PERF,
         service_id,