Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -rc20c77ef196a760a7642d2426e509995e4a98e01 -r6016d93dedc30f1fb115dc7467c88399512f459f
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision c20c77ef196a760a7642d2426e509995e4a98e01)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 6016d93dedc30f1fb115dc7467c88399512f459f)
@@ -1426,7 +1426,7 @@
         }
 #endif
 
-        if ( ( fabs( resOneDiffAfterDisplacement - resTwoDiffAfterDisplacement) <= WET_SELF_TEST_DISPLACEMENT_TOLERANCE_G ) &&
+        if ( ( fabs( resOneDiffAfterDisplacement - resTwoDiffAfterDisplacement ) <= WET_SELF_TEST_DISPLACEMENT_TOLERANCE_G ) &&
              ( ( integratedVolumeDiff <= integrateVolumeToleranceG ) ||
                ( integratedVolumeToTargetPercent <= WET_SELF_TEST_INTEGRATED_VOLUME_PCT_TOLERANCE ) ) )
         {
@@ -1551,6 +1551,7 @@
         F32 resOneDiffAfterDisplacement     = reservoirVolume[ DG_RESERVOIR_1 ] - getReservoirWeightLargeFilter( DG_RESERVOIR_1 );
         F32 resTwoDiffAfterDisplacement     = getReservoirWeightLargeFilter( DG_RESERVOIR_2 ) - reservoirVolume[ DG_RESERVOIR_2 ];
         F32 avgDisp                         = ( resOneDiffAfterDisplacement + resTwoDiffAfterDisplacement ) / 2.0;
+        F32 integratedVolumeDiff            = fabs( fmdIntegratedVolume - avgDisp );
         F32 integratedVolumeToTargetPercent = fabs( 1.0 - ( fmdIntegratedVolume / avgDisp ) );
         F32 integrateVolumeToleranceG       = WET_SELF_TEST_INTEGRATED_VOLUME_TOLERANCE;
 
@@ -1560,9 +1561,9 @@
             integrateVolumeToleranceG = 50.0F;
         }
 #endif
-
-        if ( ( fabs( resOneDiffAfterDisplacement - resTwoDiffAfterDisplacement) <= WET_SELF_TEST_DISPLACEMENT_TOLERANCE_G ) &&
-             ( integratedVolumeToTargetPercent <= integrateVolumeToleranceG ) )
+        if ( ( fabs( resOneDiffAfterDisplacement - resTwoDiffAfterDisplacement ) <= WET_SELF_TEST_DISPLACEMENT_TOLERANCE_G ) &&
+             ( ( integratedVolumeDiff <= integrateVolumeToleranceG ) ||
+               ( integratedVolumeToTargetPercent <= WET_SELF_TEST_INTEGRATED_VOLUME_PCT_TOLERANCE ) ) )
         {
             state = WET_SELF_TESTS_COMPLETE_STATE;
         }