Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r4add377f60d45effbdc064b110a59c1b8afd0ab8 -r08aa1ee4a1cc79526979153fa4759e1df3892203
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 4add377f60d45effbdc064b110a59c1b8afd0ab8)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 08aa1ee4a1cc79526979153fa4759e1df3892203)
@@ -137,7 +137,6 @@
 static BOOL isValvesSettingSent;                                    ///< Flag indicates valve setting change has been send to DG.
 
 static BOOL selfTestsResumeRequested;                               ///< Flag indicates user requesting self-tests resume.
-static BOOL selfTestsStopRequested;                                 ///< Flag indicates alarm requesting to stop self-test.
 
 // ********** private function prototypes **********
 
@@ -198,19 +197,6 @@
 
 /*********************************************************************//**
  * @brief
- * The signalStopPrime function signals self-tests to stop when an
- * alarm with stop property has been triggered.
- * @details Inputs: none
- * @details Outputs: primeStopRequested
- * @return none
- *************************************************************************/
-void signalStopSelfTests( void )
-{
-    selfTestsStopRequested = TRUE;
-}
-
-/*********************************************************************//**
- * @brief
  * The resetSelfTestsFlags function resets all self-tests signal flags.
  * @details Inputs: none
  * @details Outputs: signal flags set to FALSE
@@ -219,7 +205,6 @@
 static void resetSelfTestsFlags( void )
 {
     selfTestsResumeRequested = FALSE;
-    selfTestsStopRequested = FALSE;
 }
 
 /*********************************************************************//**
@@ -630,12 +615,11 @@
  *************************************************************************/
 static void handleNoCartSelfTestsStopRequest( void )
 {
-    if ( TRUE == selfTestsStopRequested )
+    if ( TRUE == doesAlarmStatusIndicateStop() )
     {
-        setupForSelfTestsStop();
-
         currentNoCartSelfTestsState = NO_CART_SELF_TESTS_STOPPED_STATE;
-        selfTestsStopRequested = FALSE;
+
+        setupForSelfTestsStop();
     }
 }
 
@@ -778,12 +762,11 @@
  *************************************************************************/
 static void handleDrySelfTestsStopRequest( void )
 {
-    if ( TRUE == selfTestsStopRequested )
+    if ( TRUE == doesAlarmStatusIndicateStop() )
     {
         setupForSelfTestsStop();
 
         currentDrySelfTestsState = DRY_SELF_TESTS_STOPPED_STATE;
-        selfTestsStopRequested = FALSE;
     }
 }
 
@@ -975,12 +958,11 @@
  *************************************************************************/
 static void handleWetSelfTestsStopRequest( void )
 {
-    if ( TRUE == selfTestsStopRequested )
+    if ( TRUE == doesAlarmStatusIndicateStop() )
     {
         setupForSelfTestsStop();
 
         currentWetSelfTestsState = WET_SELF_TESTS_STOPPED_STATE;
-        selfTestsStopRequested = FALSE;
     }
 }