2.8 test-suite fixes

Not sure if I agree with removing this. I realize it's going away in 2.8, but it should certainly work (and hence tested for) in 2.4 and 2.6.