Both intermittent and persistent faults may occur in a wide range of systems. We present in this paper the introduction of intermittent fault handling techniques into ProDiagnose, an algorithm that previously only handled persistent faults. We discuss novel algorithmic techniques as well as how our static Bayesian networks help diagnose, in an integrated manner, a range of intermittent and persistent faults. Through experiments with data from the ADAPT electrical power system test bed, generated as part of the Second International Diagnostic Competition (DXC-10), we show that this novel variant of ProDiagnose diagnoses intermittent faults accurately and quickly, while maintaining strong performance on persistent faults.