Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -rf116a1547129941d463b8fd156b550170a89e6a8 -r8dc2d20bdd7670a7570eb88f4f28187f3434eb19
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision f116a1547129941d463b8fd156b550170a89e6a8)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 8dc2d20bdd7670a7570eb88f4f28187f3434eb19)
@@ -222,6 +222,7 @@
     signalBloodPumpHardStop();
     signalDialInPumpHardStop();
     signalDialOutPumpHardStop();
+    cmdStopDGTrimmerHeater();
 
     if ( TRUE == isAlarmActive( ALARM_ID_HD_SYRINGE_PUMP_NOT_ENOUGH_HEPARIN_ALARM ) )
     {
@@ -1811,6 +1812,7 @@
         if ( DG_CMD_REQUEST_REJECT_REASON_NONE == cmdResp.rejectCode )
         {
             setDialInPumpTargetFlowRate( DIP_FLOW_RATE_FIRST_DISPLACEMENT_ML_MIN, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
+            cmdStartDGTrimmerHeater();
             settleStartTime = getMSTimerCount();
             state           = WET_SELF_TESTS_FIRST_DISPLACEMENT_STATE;
         }
@@ -1845,6 +1847,7 @@
         if ( TRUE == didTimeout( displacementStartTime, WET_SELF_TEST_FIRST_DISPLACEMENT_TIME_MS ) )
         {
             signalDialInPumpHardStop();
+            cmdStopDGTrimmerHeater();
             settleStartTime     = getMSTimerCount();
             state               = WET_SELF_TESTS_FIRST_DISPLACEMENT_VERIFY_STATE;
         }
@@ -1954,6 +1957,7 @@
         if ( DG_CMD_REQUEST_REJECT_REASON_NONE == cmdResp.rejectCode )
         {
             setDialInPumpTargetFlowRate( DIP_FLOW_RATE_SECOND_DISPLACEMENT_ML_MIN, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
+            cmdStartDGTrimmerHeater();
             settleStartTime = getMSTimerCount();
             state           = WET_SELF_TESTS_SECOND_DISPLACEMENT_STATE;
         }
@@ -1996,6 +2000,7 @@
         if ( TRUE == didTimeout( displacementStartTime, WET_SELF_TEST_SECOND_DISPLACEMENT_TIME_MS ) )
         {
             signalDialInPumpHardStop();
+            cmdStopDGTrimmerHeater();
             settleStartTime     = getMSTimerCount();
             state               = WET_SELF_TESTS_SECOND_DISPLACEMENT_VERIFY_STATE;
         }