This seems to fix the flickering test problem for me at least. Not sure why yet, so I'll continue to stare at it.