BUG: fix functional test suite on 2.6.