Third try to fix travis functional tests