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