Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -rf05690ed7052ec8bdfd4f28e0b405eea73966460 -r66e873b93cceb09fa4e59816e4c7ce7ab4428c86
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision f05690ed7052ec8bdfd4f28e0b405eea73966460)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 66e873b93cceb09fa4e59816e4c7ce7ab4428c86)
@@ -533,6 +533,7 @@
 static SELF_TEST_STATUS_T execUITest( void )
 {
 
+#ifndef DISABLE_UI_POST_TEST
     SELF_TEST_STATUS_T result = SELF_TEST_STATUS_IN_PROGRESS;
 
     // UI should have sent POST results before we start this test
@@ -554,8 +555,10 @@
         SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_UI_POST_FAILED, 1 )
         result = SELF_TEST_STATUS_FAILED;
     }
+#else
+    SELF_TEST_STATUS_T result = SELF_TEST_STATUS_PASSED;
+#endif
 
-    return result;
 }
 
 /**@}*/
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -rf05690ed7052ec8bdfd4f28e0b405eea73966460 -r66e873b93cceb09fa4e59816e4c7ce7ab4428c86
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision f05690ed7052ec8bdfd4f28e0b405eea73966460)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 66e873b93cceb09fa4e59816e4c7ce7ab4428c86)
@@ -384,7 +384,6 @@
  *************************************************************************/
 void execDrySelfTests( void )
 {
-// wjb    SELF_TEST_STATUS_T result = SELF_TEST_STATUS_PASSED;
 
     // execute dry self-tests state machine
     switch ( currentDrySelfTestsState )
@@ -462,13 +461,6 @@
     // Self-tests flags should be handled by now, reset if flags not handled with current state
     resetSelfTestsFlags();
 
-/* wjb
-    if ( SELF_TEST_STATUS_FAILED == result )
-    {
-        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_PRE_TREATMENT_DRY_PRESSURE_TEST_FAILURE, currentDrySelfTestsState );
-    }
-*/
-
     // Publish current self-test time data
     if ( calcTimeSince( selfTestPreviousPublishDataTime ) >= SELF_TEST_TIME_DATA_PUB_INTERVAL )
     {