Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -rf5690caf1912afbf34596055bb8fd2a62e9a32f5 -rf42812654310a70d0861f786f4ed904aea9e4a7b
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision f5690caf1912afbf34596055bb8fd2a62e9a32f5)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision f42812654310a70d0861f786f4ed904aea9e4a7b)
@@ -241,14 +241,19 @@
             break;
 
         case POST_STATE_ACCELEROMETER:
-            // 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();
             }
+#ifndef _RELEASE_
+            else
+            {
+                testStatus = SELF_TEST_STATUS_PASSED;
+            }
+#endif
             postState = handlePOSTStatus( testStatus );
             break;