ncooke3 Potential fix for flaky test (#9050)