Cleanup test failures from #4124.
Merge pull request #5235 from rwjblue/cleanup-test-failures

Cleanup test failures from #4124.