Index: NVDataMgmt.c
===================================================================
diff -u -r3db303d846dff172a31f2a5178e7aa5d8ee8ef24 -r4a839ae2509ee0847a5b2eafc313c90e7cbbc44c
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 3db303d846dff172a31f2a5178e7aa5d8ee8ef24)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 4a839ae2509ee0847a5b2eafc313c90e7cbbc44c)
@@ -1158,8 +1158,9 @@
         hasCRCPassed = FALSE;
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_NVDATA_SRVC_RECORD_CRC_ERROR, recordCRC, calcCRC );
     }
-
-    if ( hasCRCPassed || !hasCommandTimedout )
+    // There should be no failed CRCs or no command should
+    // timeout for the self test to pass
+    if ( hasCRCPassed && !hasCommandTimedout )
     {
         NVDataMgmtSelfTestResult = SELF_TEST_STATUS_PASSED;
     }