backport CI test fix to release branch