Bug 1000315 - Part 10: Fixing gaia integration tests. r=kgrandon