Bug 7317: (QA followup) Get rid of warnings from the tests