Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r09e6cf9de34acf18f6e1138bf56ac0edb4821186 -r26d736280fef713e7639cd2b98eed975e2eb4353
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 09e6cf9de34acf18f6e1138bf56ac0edb4821186)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 26d736280fef713e7639cd2b98eed975e2eb4353)
@@ -486,6 +486,7 @@
  *************************************************************************/
 void transitionToWetSelfTests()
 {
+    F32 bolusVol = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME );
     wetSelfTestsResult = FALSE;
     currentWetSelfTestsState = WET_SELF_TESTS_START_STATE;
     settleStartTime = 0;
@@ -495,6 +496,11 @@
     selfTestStartTime = getMSTimerCount();
     selfTestPreviousPublishDataTime = getMSTimerCount();
 
+    if ( ( bolusVol > 0.0 ) && ( getSyringePumpVolumeDelivered() < bolusVol ) )
+    {
+        startHeparinBolus();            // moved here from startHeparinPump() in Dialysis.c
+    }
+
     resetSelfTestsFlags();
 }