Bug 885140 - Add back missing bits from the beta uplift. a=test-only
CLOSED TREE