Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r74be223d47ea7bb0ac7d814e74d3627d830a5fac -r358e32a9fb25a6929fc5bbd7ee1d8ed2c4b69920
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 74be223d47ea7bb0ac7d814e74d3627d830a5fac)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 358e32a9fb25a6929fc5bbd7ee1d8ed2c4b69920)
@@ -202,6 +202,10 @@
     signalDialInPumpHardStop();
     signalDialOutPumpHardStop();
     stopSyringePump();
+    setValvePosition( VDI, VALVE_POSITION_A_INSERT_EJECT );
+    setValvePosition( VDO, VALVE_POSITION_A_INSERT_EJECT );
+    setValvePosition( VBA, VALVE_POSITION_A_INSERT_EJECT );
+    setValvePosition( VBV, VALVE_POSITION_A_INSERT_EJECT );
 }
 
 /*********************************************************************//**
@@ -791,6 +795,10 @@
     if ( STATE_CLOSED == getFPGADoorState() )
     {
         state = DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE;
+        setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
+        setValvePosition( VDO, VALVE_POSITION_C_CLOSE );
+        setValvePosition( VBA, VALVE_POSITION_C_CLOSE );
+        setValvePosition( VBV, VALVE_POSITION_C_CLOSE );
     }
 
     if ( TRUE == doesAlarmStatusIndicateStop() )