make some tests more 2.1-friendly