Fix randomly failing tests

Failing tests:
- https://travis-ci.org/mozilla/olympia/jobs/44603678
- https://travis-ci.org/mozilla/olympia/jobs/44807362