Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r8cebc7f282f403c99f712d422454c15414b6fc73 -r8bd1ae47aa13a843aa8abd6321ddc050deacb4a6
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 8cebc7f282f403c99f712d422454c15414b6fc73)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 8bd1ae47aa13a843aa8abd6321ddc050deacb4a6)
@@ -1,17 +1,17 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
-* @file SelfTests.c
+* @file    SelfTests.c
 *
-* @author (last) Quang Nguyen
-* @date (last) 28-Jan-2021
+* @author  (last)      Quang Nguyen
+* @date    (last)      09-Aug-2021
 *
-* @author (original) Quang Nguyen
-* @date (original) 28-Jan-2021
+* @author  (original)  Quang Nguyen
+* @date    (original)  28-Jan-2021
 *
 ***************************************************************************/
 
@@ -605,6 +605,7 @@
     signalBloodPumpHardStop();
     signalDialInPumpHardStop();
     signalDialOutPumpHardStop();
+    selfTestStartTime = getMSTimerCount();
 
     // TODO: Use appropriate sensor driver
     if ( STATE_CLOSED == getFPGADoorState() )
@@ -762,6 +763,9 @@
 {
     NO_CART_SELF_TESTS_STATE_T state = NO_CART_SELF_TESTS_STOPPED_STATE;
 
+    // Restart self-test start time
+    selfTestStartTime = getMSTimerCount();
+
     if ( TRUE == selfTestsResumeRequested )
     {
         selfTestsResumeRequested = FALSE;
@@ -784,6 +788,9 @@
 {
     DRY_SELF_TESTS_STATE_T state = DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE;
 
+    // Restart self-test start time
+    selfTestStartTime = getMSTimerCount();
+
     // TODO: Use appropriate sensor driver
     if ( STATE_CLOSED == getFPGADoorState() )
     {
@@ -1008,6 +1015,9 @@
 {
     DRY_SELF_TESTS_STATE_T state = DRY_SELF_TESTS_STOPPED_STATE;
 
+    // Restart self-test start time
+    selfTestStartTime = getMSTimerCount();
+
     if ( TRUE == selfTestsResumeRequested )
     {
         selfTestsResumeRequested = FALSE;