Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -r834383d5b8aab93b93425fdcc36954b9a89aef74 -r6e3bbb4c27eae91fed11b118cced935a04c6b90a
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 834383d5b8aab93b93425fdcc36954b9a89aef74)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 6e3bbb4c27eae91fed11b118cced935a04c6b90a)
@@ -149,11 +149,18 @@
             break;
 
         case DG_POST_STATE_ACCELEROMETER:
-#ifndef DISABLE_ACCELS
-            testStatus = execAccelTest();
-#else
-            testStatus = SELF_TEST_STATUS_PASSED;
+#ifndef _RELEASE_
+            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ACCELS ) != SW_CONFIG_ENABLE_VALUE )
 #endif
+            {
+                testStatus = execAccelTest();
+            }
+#ifndef _RELEASE_
+            else
+            {
+                testStatus = SELF_TEST_STATUS_PASSED;
+            }
+#endif
             postState = handlePOSTStatus( testStatus );
             break;
 
@@ -188,10 +195,18 @@
             break;
 
         case DG_POST_STATE_UV_REACTORS:
-#ifndef DISABLE_UV_REACTORS
-            testStatus = execUVReactorsSelfTest();
+#ifndef _RELEASE_
+            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_UV_REACTORS ) != SW_CONFIG_ENABLE_VALUE )
 #endif
-            testStatus = SELF_TEST_STATUS_PASSED;
+            {
+                testStatus = execUVReactorsSelfTest();
+            }
+#ifndef _RELEASE_
+            else
+            {
+                testStatus = SELF_TEST_STATUS_PASSED;
+            }
+#endif
             postState = handlePOSTStatus( testStatus );
             break;
 
@@ -338,9 +353,6 @@
         // mode previous and current are both published as Init
         SEND_EVENT_WITH_2_U32_DATA( DG_EVENT_OP_MODE_CHANGE, DG_MODE_INIT, DG_MODE_INIT )
         state = DG_POST_STATE_FW_COMPATIBILITY;
-#ifdef SKIP_POST
-        state = DG_POST_STATE_COMPLETED;
-#endif
         startPOSTDelayCounter = 0;
     }