Some 2.6 compatbility in tests