Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -rda7e8c1b71db9273f83e9d0ba7d20e74e758a8ad -r4add9605a250a0b953217c8673204b705128561b
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision da7e8c1b71db9273f83e9d0ba7d20e74e758a8ad)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 4add9605a250a0b953217c8673204b705128561b)
@@ -94,7 +94,8 @@
 
 static NO_CART_SELF_TESTS_STATE_T currentNoCartSelfTestsState;      ///< Current state of the no cartridge self-tests state machine.
 static U32 runPumpStartTime;                                        ///< Beginning time when pumps start running
-static BOOL havePumpsStarted;                                       ///< Flag indicates pumps have started running for self-test.
+static BOOL havePumpsStartedForNCST;                                ///< Flag indicates pumps have started running for no cartridge pumps self-test.
+static BOOL pumpHomingRequestedForNCST;                             ///< Flag indicates pumps should be homed after running no cartridge pumps self-test.
 
 static DRY_SELF_TESTS_STATE_T currentDrySelfTestsState;             ///< Current state of the dry self-tests state machine.
 static U32 pressureSelfTestBloodPumpRunStartTime;                   ///< Pressure dry self-test blood pump runs start time.
@@ -259,7 +260,8 @@
 
     currentNoCartSelfTestsState = NO_CART_SELF_TESTS_START_STATE;
     runPumpStartTime = 0;
-    havePumpsStarted = FALSE;
+    havePumpsStartedForNCST = FALSE;
+    pumpHomingRequestedForNCST = FALSE;
     selfTestStartTime = getMSTimerCount();
     selfTestPreviousPublishDataTime = getMSTimerCount();
 
@@ -793,36 +795,41 @@
  * @brief
  * The handleNoCartSelfTestPumpsState function runs blood, dialysate inlet,
  * dialysate outlet pumps for certain time to make sure no alarms occur.
- * @details Inputs: none
- * @details Outputs: Ran self-test for blood, dialysate in, dialysate out pumps
+ * @details Inputs: havePumpsStartedForNCST
+ * @details Outputs: pumpHomingRequestedForNCST,
+ * Ran self-test for blood, dialysate in, dialysate out pumps
  * @return the next state of no cartridge self-tests state machine
  *************************************************************************/
 static NO_CART_SELF_TESTS_STATE_T handleNoCartSelfTestPumpsState( void )
 {
     NO_CART_SELF_TESTS_STATE_T state = NO_CART_SELF_TESTS_PUMPS_STATE;
 
-    if ( FALSE == havePumpsStarted )
+    if ( FALSE == havePumpsStartedForNCST )
     {
-        havePumpsStarted = TRUE;
+        havePumpsStartedForNCST = TRUE;
 
         setBloodPumpTargetFlowRate( PUMP_SELF_TEST_FLOW_RATE_ML_MIN, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
         setDialInPumpTargetFlowRate( PUMP_SELF_TEST_FLOW_RATE_ML_MIN, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
         setDialOutPumpTargetRate( PUMP_SELF_TEST_FLOW_RATE_ML_MIN, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
         runPumpStartTime = getMSTimerCount();
     }
 
-    if ( TRUE == didTimeout( runPumpStartTime, PUMP_RUN_SELF_TEST_TIME_MS ) )
+    if ( TRUE == pumpHomingRequestedForNCST )
     {
-        signalBloodPumpHardStop();
-        signalDialInPumpHardStop();
-        signalDialOutPumpHardStop();
-
         // Home pumps for cartridge installation
         homeBloodPump();
         homeDialInPump();
         homeDialOutPump();
         state = NO_CART_SELF_TESTS_HOME_IDLE_STATE;
     }
+    else if ( TRUE == didTimeout( runPumpStartTime, PUMP_RUN_SELF_TEST_TIME_MS ) )
+    {
+        // Request homing of pumps for cartridge installation
+        signalBloodPumpHardStop();
+        signalDialInPumpHardStop();
+        signalDialOutPumpHardStop();
+        pumpHomingRequestedForNCST = TRUE;
+    }
 
     if ( TRUE == doesAlarmStatusIndicateStop() )
     {
@@ -878,7 +885,8 @@
     if ( TRUE == selfTestsResumeRequested )
     {
         selfTestsResumeRequested = FALSE;
-        havePumpsStarted = FALSE;
+        havePumpsStartedForNCST = FALSE;
+        pumpHomingRequestedForNCST = FALSE;
         doorClosedRequired( TRUE, TRUE );
         state = NO_CART_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE;
     }