Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -re4cc37257141c5227186ac6d8ca3d6c87d009042 -rb14efe97c6baf3cca79d9199fd0575768262eb9f
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision e4cc37257141c5227186ac6d8ca3d6c87d009042)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision b14efe97c6baf3cca79d9199fd0575768262eb9f)
@@ -601,6 +601,7 @@
     signalBloodPumpHardStop();
     signalDialInPumpHardStop();
     signalDialOutPumpHardStop();
+    selfTestStartTime = getMSTimerCount();
 
     // TODO: Use appropriate sensor driver
     if ( STATE_CLOSED == getFPGADoorState() )
@@ -758,6 +759,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;
@@ -780,6 +784,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() )
     {
@@ -1000,6 +1007,9 @@
 {
     DRY_SELF_TESTS_STATE_T state = DRY_SELF_TESTS_STOPPED_STATE;
 
+    // Restart self-test start time
+    selfTestStartTime = getMSTimerCount();
+
     if ( TRUE == selfTestsResumeRequested )
     {
         selfTestsResumeRequested = FALSE;