Bug 1023819 - Follow up to fix broken integration tests. r=me