Uplift from https://github.com/mozilla/marketplace-tests/pull/556/files
Merge pull request #557 from AndreiH/master

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