- Find an e2e test from tests/e2e that looks like a system test. - Rewrite it as a system test and verify it runs with v1 and v2 (CI does that) - Delete the old e2e test.