Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -r09e6cf9de34acf18f6e1138bf56ac0edb4821186 -rb3375bb1bc7910b7f45922d2eb4e55bb1dcc3c16
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 09e6cf9de34acf18f6e1138bf56ac0edb4821186)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision b3375bb1bc7910b7f45922d2eb4e55bb1dcc3c16)
@@ -159,6 +159,7 @@
 {
     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:
@@ -242,7 +243,11 @@
             result = SELF_TEST_STATUS_FAILED;
             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;
 }