Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r44a100f8e5210a02c23b8fcc4527d8e96d577381 -r88e0f56fa5eb3af397fee7cebb49efdab54f8491
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 44a100f8e5210a02c23b8fcc4527d8e96d577381)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 88e0f56fa5eb3af397fee7cebb49efdab54f8491)
@@ -593,6 +593,7 @@
     signalBloodPumpHardStop();
     signalDialInPumpHardStop();
     signalDialOutPumpHardStop();
+    selfTestStartTime = getMSTimerCount();
 
     // TODO: Use appropriate sensor driver
     if ( STATE_CLOSED == getFPGADoorState() )
@@ -750,6 +751,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;
@@ -772,6 +776,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() )
     {
@@ -992,6 +999,9 @@
 {
     DRY_SELF_TESTS_STATE_T state = DRY_SELF_TESTS_STOPPED_STATE;
 
+    // Restart self-test start time
+    selfTestStartTime = getMSTimerCount();
+
     if ( TRUE == selfTestsResumeRequested )
     {
         selfTestsResumeRequested = FALSE;