Work around a bunch of spurious test failures
1 file changed