Bug 1053786 - [v2.1] Fix Everything me test failures