Avoid deprecated API in cross-test