Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -ref6283257df7c1f993d58fb934da57ea3e0a7067 -r0c439ddcf7e4d3d4bf63df679eacf2f12f01255f
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision ef6283257df7c1f993d58fb934da57ea3e0a7067)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 0c439ddcf7e4d3d4bf63df679eacf2f12f01255f)
@@ -158,7 +158,6 @@
 {
     SELF_TEST_STATUS_T result = SELF_TEST_STATUS_IN_PROGRESS;
 
-#ifndef DISABLE_WD_AND_SFTY_POST_TESTS
     switch ( watchdogSelfTestState )
     {
         case WATCHDOG_SELF_TEST_STATE_START:
@@ -249,10 +248,6 @@
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_WATCHDOG_INVALID_SELF_TEST_STATE, watchdogSelfTestState )
             break;
     }
-#else
-    watchdogSelfTestStatus = SELF_TEST_STATUS_PASSED;
-    result = watchdogSelfTestStatus;
-#endif
 
     return result;
 }