Uplift from https://github.com/mozilla/marketplace-tests/pull/556/files