Re #5939. Try to fix test that's failing in some places.