Merge pull request #11727 from milseman/unbreak

Un-break resilience tests on non-mac platforms