Uplift https://github.com/mozilla/marketplace-tests/commit/0f43b04cf47653a0dfa558fa8b1fa32cb514e058