Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -r667feab319b14681a0330a715da7a1ba930b518d -r2a3a47ca90ad19851a30c52f6999a56d5f578783
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 667feab319b14681a0330a715da7a1ba930b518d)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 2a3a47ca90ad19851a30c52f6999a56d5f578783)
@@ -240,11 +240,14 @@
             break;
 
         case POST_STATE_ACCELEROMETER:
-#ifndef DISABLE_ACCELS
-            testStatus = execAccelTest();
-#else
+            // TODO I don't like this
             testStatus = SELF_TEST_STATUS_PASSED;
+#ifndef _RELEASE_
+            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ACCELEROMETERS ) != SW_CONFIG_ENABLE_VALUE )
 #endif
+            {
+                testStatus = execAccelTest();
+            }
             postState = handlePOSTStatus( testStatus );
             break;