Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r1bff8e530735be63ba557b77557a0bc2ac4b37b2 -r94ec88c9d751596eaaeae6d87630c7ff4d655c1e
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 1bff8e530735be63ba557b77557a0bc2ac4b37b2)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 94ec88c9d751596eaaeae6d87630c7ff4d655c1e)
@@ -1835,13 +1835,20 @@
     }
     else
     {
-        if ( fabs( resOneDiffAfterDisplacement - resTwoDiffAfterDisplacement) > WET_SELF_TEST_DISPLACEMENT_TOLERANCE_G )
+        if ( getTestConfigStatus( TEST_CONFIG_DISABLE_WET_SELFTEST_DISPLACEMENT_CHECK ) != TRUE )
         {
-            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_PRE_TREATMENT_WET_LC_TEST_FAILURE, resOneDiffAfterDisplacement, resTwoDiffAfterDisplacement );
+            if ( fabs( resOneDiffAfterDisplacement - resTwoDiffAfterDisplacement) > WET_SELF_TEST_DISPLACEMENT_TOLERANCE_G )
+            {
+                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_PRE_TREATMENT_WET_LC_TEST_FAILURE, resOneDiffAfterDisplacement, resTwoDiffAfterDisplacement );
+            }
+            else
+            {
+                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_PRE_TREATMENT_WET_FLOW_TEST_FAILURE, averageDisp, fmdIntegratedVolume );
+            }
         }
         else
         {
-            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_PRE_TREATMENT_WET_FLOW_TEST_FAILURE, averageDisp, fmdIntegratedVolume );
+            state = WET_SELF_TESTS_SECOND_DISPLACEMENT_SETUP_STATE;
         }
     }
 
@@ -1978,13 +1985,20 @@
     }
     else
     {
-        if ( fabs( resOneDiffAfterDisplacement - resTwoDiffAfterDisplacement) > WET_SELF_TEST_DISPLACEMENT_TOLERANCE_G )
+        if ( getTestConfigStatus( TEST_CONFIG_DISABLE_WET_SELFTEST_DISPLACEMENT_CHECK ) != TRUE )
         {
-            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_PRE_TREATMENT_WET_LC_TEST_FAILURE, resOneDiffAfterDisplacement, resTwoDiffAfterDisplacement );
+            if ( fabs( resOneDiffAfterDisplacement - resTwoDiffAfterDisplacement) > WET_SELF_TEST_DISPLACEMENT_TOLERANCE_G )
+            {
+                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_PRE_TREATMENT_WET_LC_TEST_FAILURE, resOneDiffAfterDisplacement, resTwoDiffAfterDisplacement );
+            }
+            else
+            {
+                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_PRE_TREATMENT_WET_FLOW_TEST_FAILURE, avgDisp, fmdIntegratedVolume );
+            }
         }
         else
         {
-            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_PRE_TREATMENT_WET_FLOW_TEST_FAILURE, avgDisp, fmdIntegratedVolume );
+            state = WET_SELF_TESTS_COMPLETE_STATE;
         }
     }