Fix broken tests related to RT #63066