Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r827d379703a8ca50989d932e92bc2f488ed82f1e -re1bfaf98ac6b4010e68ab39e0452b1a77caf4464
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 827d379703a8ca50989d932e92bc2f488ed82f1e)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision e1bfaf98ac6b4010e68ab39e0452b1a77caf4464)
@@ -238,14 +238,17 @@
     }
 
 #ifdef CARTRIDGE_TEST_BUILD
-    if ( ( TRUE == testCartridgesMode ) && ( ++testCartridgesTimerCtr >= CARTRIDGE_TEST_COMPLETE_TIME ) )
+    if ( TRUE == testCartridgesMode )
     {
-        stop = TRUE;  // Stop cartridge test after 10 hrs
+        if ( ++testCartridgesTimerCtr >= CARTRIDGE_TEST_COMPLETE_TIME )
+        {
+            stop = TRUE;  // Stop cartridge test after 10 hrs
+        }
+        if ( TRUE == isAlarmActive( ALARM_ID_HD_FLUID_LEAK_DETECTED ) )
+        {
+            stop = TRUE;  // Stop cartridge test if a fluid leak is detected
+        }
     }
-    if ( TRUE == isAlarmActive( ALARM_ID_HD_FLUID_LEAK_DETECTED ) )
-    {
-        stop = TRUE;  // Stop cartridge test if a fluid leak is detected
-    }
 
     if ( TRUE == stop )
     {