Upstream patch "Fix test suite on arm"