Index: firmware/App/Modes/ModePreTreat.h
===================================================================
diff -u -r24b2fe72608344e67ef37234085d15ad5e4fcc37 -r3ddc95eb7a9b5fe45ba2fdb728d57f3adeb6e114
--- firmware/App/Modes/ModePreTreat.h	(.../ModePreTreat.h)	(revision 24b2fe72608344e67ef37234085d15ad5e4fcc37)
+++ firmware/App/Modes/ModePreTreat.h	(.../ModePreTreat.h)	(revision 3ddc95eb7a9b5fe45ba2fdb728d57f3adeb6e114)
@@ -37,7 +37,7 @@
 {
     U32 preTreatmentSubMode;        ///< Current pre-treatment sub-mode
     U32 sampleWaterState;           ///< Current sample water state
-    U32 consumableSelfTestsState;   ///< Current consumable sefl-tests state
+    U32 consumableSelfTestsState;   ///< Current consumable self-tests state
     U32 noCartSelfTestsState;       ///< Current no cartridge self-tests state
     U32 installState;               ///< Current disposable installation state
     U32 drySelfTestsState;          ///< Current dry self-tests state
Index: firmware/App/Modes/Prime.c
===================================================================
diff -u -r7d373c4a2798542bc39a139a10b3d59c4a355807 -r3ddc95eb7a9b5fe45ba2fdb728d57f3adeb6e114
--- firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 7d373c4a2798542bc39a139a10b3d59c4a355807)
+++ firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 3ddc95eb7a9b5fe45ba2fdb728d57f3adeb6e114)
@@ -840,21 +840,11 @@
         signalResumeSelfTests();
     }
 
-#ifndef _RELEASE_
-    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_WET_SELF_TEST ) != SW_CONFIG_ENABLE_VALUE )
-#endif
-    {
-        execWetSelfTests();
-    }
+    execWetSelfTests();
 
     if ( TRUE == isWetSelfTestsPassed() )
     {
-#ifndef _RELEASE_
-        if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_WET_SELF_TEST ) )
-#endif
-        {
-         state = HD_PRIME_COMPLETE;
-        }
+        state = HD_PRIME_COMPLETE;
     }
 
     if ( TRUE == doesAlarmStatusIndicateStop() )
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r7d373c4a2798542bc39a139a10b3d59c4a355807 -r3ddc95eb7a9b5fe45ba2fdb728d57f3adeb6e114
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 7d373c4a2798542bc39a139a10b3d59c4a355807)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 3ddc95eb7a9b5fe45ba2fdb728d57f3adeb6e114)
@@ -543,6 +543,13 @@
 {
     SELF_TEST_STATUS_T result = SELF_TEST_STATUS_PASSED;
 
+#ifndef _RELEASE_
+    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_WET_SELF_TEST ) != SW_CONFIG_ENABLE_VALUE )
+    {
+        currentWetSelfTestsState = WET_SELF_TESTS_COMPLETE_STATE;
+    }
+#endif
+
     // execute wet self-tests state machine
     switch ( currentWetSelfTestsState )
     {