Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -rfeaae35e827b3ffeb5d0de9df41ba2390d058849 -r838df450f09668adbd73e61fadbff8c81fe7926e
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision feaae35e827b3ffeb5d0de9df41ba2390d058849)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 838df450f09668adbd73e61fadbff8c81fe7926e)
@@ -261,11 +261,10 @@
 
         case NO_CART_SELF_TESTS_DIALYSATE_FLOW_METERS_STATE:
             execDialInFlowTest();
-            currentNoCartSelfTestsState = NO_CART_SELF_TESTS_PUMPS_STATE;
-            break;
 
-        case NO_CART_SELF_TESTS_PUMPS_STATE:
-            currentNoCartSelfTestsState = handleNoCartSelfTestPumpsState();
+            // TODO: Use appropriate sensor driver
+            setFPGASensorTest( BLOOD_LEAK_SELF_TEST_SET );
+            currentNoCartSelfTestsState = NO_CART_SELF_TESTS_LEAK_DETECTORS_STATE;
             break;
 
         case NO_CART_SELF_TESTS_LEAK_DETECTORS_STATE:
@@ -285,6 +284,10 @@
             currentNoCartSelfTestsState = handleNoCartSelfTestHomeValvesAndPumpState();
             break;
 
+        case NO_CART_SELF_TESTS_PUMPS_STATE:
+            currentNoCartSelfTestsState = handleNoCartSelfTestPumpsState();
+            break;
+
         case NO_CART_SELF_TESTS_STOPPED_STATE:
             currentNoCartSelfTestsState = handleNoCartSelfTestStoppedState();
             break;
@@ -621,9 +624,7 @@
         signalDialInPumpHardStop();
         signalDialOutPumpHardStop();
 
-        // TODO: Use appropriate sensor driver
-        setFPGASensorTest( BLOOD_LEAK_SELF_TEST_SET );
-        state = NO_CART_SELF_TESTS_LEAK_DETECTORS_STATE;
+        state = NO_CART_SELF_TESTS_COMPLETE_STATE;
     }
 
     if ( TRUE == doesAlarmStatusIndicateStop() )
@@ -726,7 +727,7 @@
     if ( ( FALSE == isDialInPumpRunning() ) && ( FALSE == isDialOutPumpRunning() ) &&
          ( FALSE == isBloodPumpRunning() ) && ( TRUE == isSyringePumpHome() ) )
     {
-        state = NO_CART_SELF_TESTS_COMPLETE_STATE;
+        state = NO_CART_SELF_TESTS_PUMPS_STATE;
     }
 
     if ( TRUE == doesAlarmStatusIndicateStop() )