Cope with recent intermittent test failures.