Fix the timing issues in this test with a diff from the fix
on the master branch #3932