Bug 1104055 - fix test crashes on v2.1, a=bustage