Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r139d7ba2733169cc738b6421eed50a7694691c0a -ra1a592eaed002ee7ef84e56fb7864b8d40b14661
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 139d7ba2733169cc738b6421eed50a7694691c0a)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision a1a592eaed002ee7ef84e56fb7864b8d40b14661)
@@ -295,7 +295,7 @@
     pumpHomingRequestedForNCST = FALSE;
     selfTestStartTime = getMSTimerCount();
     selfTestPreviousPublishDataTime = getMSTimerCount();
-
+    setCurrentSubState( (U32)currentNoCartSelfTestsState );
     doorClosedRequired( TRUE, TRUE );
 
     // Pumps should be off
@@ -429,7 +429,7 @@
     selfTestPreviousPublishDataTime = getMSTimerCount();
     selfTestCartridgeSettleTime = getMSTimerCount();
     doorClosedRequired( FALSE, TRUE );
-
+    setCurrentSubState( (U32)currentDrySelfTestsState );
     // Pumps should be off
     signalBloodPumpHardStop();
     signalDialInPumpHardStop();