Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r7c0f0fa22adeb8e268ce1197a9de6adf11d5c09b -r0c4df5613de92846b814da5baaee939bcc9de4e0
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 7c0f0fa22adeb8e268ce1197a9de6adf11d5c09b)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 0c4df5613de92846b814da5baaee939bcc9de4e0)
@@ -1383,12 +1383,11 @@
 
     if ( TRUE == didTimeout( settleStartTime, RESERVOIR_SETTLE_TIME_MS ) )
     {
-        F32 const resOneDiffAfterDisplacement = reservoirVolume[ DG_RESERVOIR_1 ] - getReservoirWeightLargeFilter( DG_RESERVOIR_1 );
-        F32 const resTwoDiffAfterDisplacement = getReservoirWeightLargeFilter( DG_RESERVOIR_2 ) - reservoirVolume[ DG_RESERVOIR_2 ];
-        F32 const integratedVolumeToTargetPercent = fabs( 1.0 - ( fmdIntegratedVolume / WET_SELF_TEST_FIRST_DISPLACEMENT_TARGET_VOLUME_ML ) );
+        F32 resOneDiffAfterDisplacement     = reservoirVolume[ DG_RESERVOIR_1 ] - getReservoirWeightLargeFilter( DG_RESERVOIR_1 );
+        F32 resTwoDiffAfterDisplacement     = getReservoirWeightLargeFilter( DG_RESERVOIR_2 ) - reservoirVolume[ DG_RESERVOIR_2 ];
+        F32 averageDisp                     = ( resOneDiffAfterDisplacement + resTwoDiffAfterDisplacement ) / 2.0;
+        F32 integratedVolumeToTargetPercent = fabs( 1.0 - ( fmdIntegratedVolume / averageDisp ) );
 
-        //
-
         if ( ( fabs( resOneDiffAfterDisplacement - resTwoDiffAfterDisplacement) <= WET_SELF_TEST_DISPLACEMENT_TOLERANCE_G ) &&
              ( integratedVolumeToTargetPercent <= WET_SELF_TEST_INTEGRATED_VOLUME_TOLERANCE ) )
         {
@@ -1503,9 +1502,10 @@
 
     if ( TRUE == didTimeout( settleStartTime, RESERVOIR_SETTLE_TIME_MS ) )
     {
-        F32 const resOneDiffAfterDisplacement = getReservoirWeightLargeFilter( DG_RESERVOIR_1 ) - reservoirVolume[ DG_RESERVOIR_1 ];
-        F32 const resTwoDiffAfterDisplacement = reservoirVolume[ DG_RESERVOIR_2 ]  - getReservoirWeightLargeFilter( DG_RESERVOIR_2 );
-        F32 const integratedVolumeToTargetPercent = fabs( 1.0 - ( fmdIntegratedVolume / WET_SELF_TEST_SECOND_DISPLACEMENT_TARGET_VOLUME_ML ) );
+        F32 resOneDiffAfterDisplacement     = getReservoirWeightLargeFilter( DG_RESERVOIR_1 ) - reservoirVolume[ DG_RESERVOIR_1 ];
+        F32 resTwoDiffAfterDisplacement     = reservoirVolume[ DG_RESERVOIR_2 ]  - getReservoirWeightLargeFilter( DG_RESERVOIR_2 );
+        F32 avgDisp                         = ( resOneDiffAfterDisplacement + resTwoDiffAfterDisplacement ) / 2.0;
+        F32 integratedVolumeToTargetPercent = fabs( 1.0 - ( fmdIntegratedVolume / avgDisp ) );
 
         if ( ( fabs( resOneDiffAfterDisplacement - resTwoDiffAfterDisplacement) <= WET_SELF_TEST_DISPLACEMENT_TOLERANCE_G ) &&
              ( integratedVolumeToTargetPercent <= WET_SELF_TEST_INTEGRATED_VOLUME_TOLERANCE ) )