Bug 1058362 - Fix failing gaia integration tests. r=timdream