numerous unit test failures after elasticsearch upgrade to 0.90.6

After upgrading elasticsearch to 0.90.6 the tests take ~23 minutes to complete and I've seen anywhere between 4 to 30 test failures, usually starting with search failures followed by timeout failures. Elasticsearch 0.90.1 and 0.90.5 both work fine.