Second try to fix travis functional tests