make test infrastructure work for 2.6 and 3.3