Restored 2.6 testing