[#1659] workaround for old failing functional tests