Try to make this test more generic to unbreak buildbots.