Fix functional test failure introduced at b9156bef7