Merge pull request #6783 from remitamine/yahoo-tests