Bug 856543 - Followup to fix linter tests.