Modification for Issue 500

https://github.com/mozilla/marketplace-tests/issues/500