Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -ra33009eaa35d2d5be3872b64f2f1609196769256 -r9944e4f766d9eb4cdf7a5ca7587e3ceca556e106
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision a33009eaa35d2d5be3872b64f2f1609196769256)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 9944e4f766d9eb4cdf7a5ca7587e3ceca556e106)
@@ -7,8 +7,8 @@
 *
 * @file    SelfTests.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      31-Mar-2022
+* @author  (last)      Darren Cox
+* @date    (last)      13-May-2022
 *
 * @author  (original)  Quang Nguyen
 * @date    (original)  28-Jan-2021
@@ -384,6 +384,8 @@
  *************************************************************************/
 void execDrySelfTests( void )
 {
+    SELF_TEST_STATUS_T result = SELF_TEST_STATUS_PASSED;
+
     // execute dry self-tests state machine
     switch ( currentDrySelfTestsState )
     {
@@ -460,6 +462,11 @@
     // Self-tests flags should be handled by now, reset if flags not handled with current state
     resetSelfTestsFlags();
 
+    if ( SELF_TEST_STATUS_FAILED == result )
+    {
+        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_PRE_TREATMENT_DRY_PRESSURE_TEST_FAILURE, currentDrySelfTestsState );
+    }
+
     // Publish current self-test time data
     if ( calcTimeSince( selfTestPreviousPublishDataTime ) >= SELF_TEST_TIME_DATA_PUB_INTERVAL )
     {
@@ -538,6 +545,8 @@
  *************************************************************************/
 void execWetSelfTests( void )
 {
+    SELF_TEST_STATUS_T result = SELF_TEST_STATUS_PASSED;
+
 #ifndef _RELEASE_
     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_WET_SELF_TEST ) == SW_CONFIG_ENABLE_VALUE )
     {
@@ -607,6 +616,11 @@
 
     // Self-tests flags should be handled by now, reset if flags not handled with current state
     resetSelfTestsFlags();
+
+    if ( SELF_TEST_STATUS_FAILED == result )
+    {
+        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_PRE_TREATMENT_WET_LC_TEST_FAILURE, currentWetSelfTestsState );
+    }
 }
 
 /*********************************************************************//**