speed up the tests by doing less (bug 817656)