A method and system for faster initial program loads by normally booting a data processing system without extended diagnostic tests is disclosed. A service processor is provided and located within the data processing system to monitor the data processing system during runtime operations for a system failure. When a system failure occurs, the service processor enables a diagnostic flag located in non-volatile memory. On the first or next boot of the data processing system after repair of the system failure, the diagnostic flag indicates to the service processor to perform an extended diagnostics test. Upon completion of the extended diagnostics test, the diagnostic flag is disabled and the service processor once again monitors the data processing system for a system failure.