Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -rb156b12139fea40401c94b512503a2ceced69e22 -r533dc50613389ef694c7bcdf3edc0d9c0c44e14c
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision b156b12139fea40401c94b512503a2ceced69e22)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 533dc50613389ef694c7bcdf3edc0d9c0c44e14c)
@@ -221,6 +221,7 @@
     signalBloodPumpHardStop();
     signalDialInPumpHardStop();
     signalDialOutPumpHardStop();
+    cmdStopDGTrimmerHeater();
 
     if ( TRUE == isAlarmActive( ALARM_ID_HD_SYRINGE_PUMP_NOT_ENOUGH_HEPARIN_ALARM ) )
     {
@@ -1782,6 +1783,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;
         }
@@ -1816,6 +1818,7 @@
         if ( TRUE == didTimeout( displacementStartTime, WET_SELF_TEST_FIRST_DISPLACEMENT_TIME_MS ) )
         {
             signalDialInPumpHardStop();
+            cmdStopDGTrimmerHeater();
             settleStartTime     = getMSTimerCount();
             state               = WET_SELF_TESTS_FIRST_DISPLACEMENT_VERIFY_STATE;
         }
@@ -1925,6 +1928,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;
         }
@@ -1967,6 +1971,7 @@
         if ( TRUE == didTimeout( displacementStartTime, WET_SELF_TEST_SECOND_DISPLACEMENT_TIME_MS ) )
         {
             signalDialInPumpHardStop();
+            cmdStopDGTrimmerHeater();
             settleStartTime     = getMSTimerCount();
             state               = WET_SELF_TESTS_SECOND_DISPLACEMENT_VERIFY_STATE;
         }