Update `4.x` with the new test registry

[jjotero]

This should be rather straightforward after #2119 is done.

[jjotero]

No need to keep this as an issue, since this will already happen after the 4.x branch is updated with the latest master