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