2.8 test-suite fixes

Or rather, have one for 2.4/2.6; and one for 2.8.