Bug 944361 - Followup to fix addon tests