diff --git a/tests/e2e/project/patches.spec.ts b/tests/e2e/project/patches.spec.ts
index ba2fa6db4..9dab6561c 100644
--- a/tests/e2e/project/patches.spec.ts
+++ b/tests/e2e/project/patches.spec.ts
@@ -36,12 +36,36 @@ test("navigate patch details", async ({ page }) => {
 
 test("use revision selector", async ({ page }) => {
   await page.goto(`${cobUrl}/patches/0f3697fed2743549e3bf531e9fa81284a6de1466`);
-  await page.locator("role=link[name='Files']").click();
-  await page.locator("text='Revision febcbbd'").click();
-  await page.locator("role=link[name='Revision febcbbd']").click();
+  await page.getByRole("link", { name: "Files" }).click();
+
+  // Validating the latest revision state
+  await expect(
+    page.getByRole("cell", { name: "Had to push a new revision" }),
+  ).toBeVisible();
+  await page.getByRole("link", { name: "Commits" }).click();
+  await expect(page.locator(".commit-list .teaser")).toHaveCount(2);
+  await expect(
+    page.locator(".commit-list .teaser .markdown").first(),
+  ).toHaveText("Add more text");
+
+  // Switching to the initial revision
+  await page.getByText("Revision 5140fb2").click();
+  await expect(page.locator(".dropdown")).toBeVisible();
+  await page.getByRole("link", { name: "Revision 0f3697f" }).click();
+  await expect(page.locator(".dropdown")).toBeHidden();
+
+  // Validating the initial revision
+  await expect(page.locator(".commit-list .teaser")).toHaveCount(1);
+  await expect(
+    page.locator(".commit-list .teaser .markdown").first(),
+  ).toHaveText("Rewrite subtitle to README");
+  await page.getByRole("link", { name: "Files" }).click();
+  await expect(
+    page.getByRole("cell", { name: "Had to push a new revision" }),
+  ).toBeHidden();
 
   await expect(page).toHaveURL(
-    `${cobUrl}/patches/0f3697fed2743549e3bf531e9fa81284a6de1466/febcbbd60c4977ac6a985f7589ec65bbae7f2d60?tab=files`,
+    `${cobUrl}/patches/0f3697fed2743549e3bf531e9fa81284a6de1466/0f3697fed2743549e3bf531e9fa81284a6de1466?tab=files`,
   );
 });
 
@@ -55,33 +79,33 @@ test("navigate through revision diffs", async ({ page }) => {
   {
     await secondRevision.locator(".toggle").click();
     await secondRevision
-      .locator("role=link[name='Compare to main (38c225e)']")
+      .getByRole("link", { name: "Compare to main (38c225e)" })
       .click();
     await expect(
-      page.locator("role=link[name='Diff 38c225..5b35de']"),
+      page.getByRole("link", { name: "Diff 38c225..9898da" }),
     ).toBeVisible();
     await expect(page).toHaveURL(
-      `${cobUrl}/patches/0f3697fed2743549e3bf531e9fa81284a6de1466?diff=38c225e2a0b47ba59def211f4e4825c31d9463ec..5b35def19c2c7f0c0f1b3fd12d0a7c5930ef6b09`,
+      `${cobUrl}/patches/0f3697fed2743549e3bf531e9fa81284a6de1466?diff=38c225e2a0b47ba59def211f4e4825c31d9463ec..9898da6155467adad511f63bf0fb5aa4156b92ef`,
     );
     await page.goBack();
     await secondRevision.locator(".toggle").click();
     await secondRevision
-      .locator("role=link[name='Compare to previous revision (0f3697f)']")
+      .getByRole("link", { name: "Compare to previous revision (0f3697f)" })
       .click();
     await expect(
-      page.locator("role=link[name='Diff 0dc373..5b35de']"),
+      page.getByRole("link", { name: "Diff 0dc373..9898da" }),
     ).toBeVisible();
 
     await expect(page).toHaveURL(
-      `${cobUrl}/patches/0f3697fed2743549e3bf531e9fa81284a6de1466?diff=0dc373db601ccbcffa80dec932e4006516709ca6..5b35def19c2c7f0c0f1b3fd12d0a7c5930ef6b09`,
+      `${cobUrl}/patches/0f3697fed2743549e3bf531e9fa81284a6de1466?diff=0dc373db601ccbcffa80dec932e4006516709ca6..9898da6155467adad511f63bf0fb5aa4156b92ef`,
     );
     await page.goBack();
 
     await secondRevision
-      .locator("role=link[name='Compare 0dc373d..5b35def']")
+      .getByRole("link", { name: "Compare 0dc373d..9898da6" })
       .click();
     await expect(
-      page.getByRole("link", { name: "Diff 0dc373..5b35de" }),
+      page.getByRole("link", { name: "Diff 0dc373..9898da" }),
     ).toBeVisible();
     await page.goBack();
   }
@@ -89,10 +113,10 @@ test("navigate through revision diffs", async ({ page }) => {
   {
     await firstRevision.locator(".toggle").click();
     await firstRevision
-      .locator("role=link[name='Compare to main (38c225e)']")
+      .getByRole("link", { name: "Compare to main (38c225e)" })
       .click();
     await expect(
-      page.locator("role=link[name='Diff 38c225..0dc373']"),
+      page.getByRole("link", { name: "Diff 38c225..0dc373" }),
     ).toBeVisible();
     await expect(page).toHaveURL(
       `${cobUrl}/patches/0f3697fed2743549e3bf531e9fa81284a6de1466?diff=38c225e2a0b47ba59def211f4e4825c31d9463ec..0dc373db601ccbcffa80dec932e4006516709ca6`,
diff --git a/tests/support/cobs/patch.ts b/tests/support/cobs/patch.ts
index 006c8fc78..d9576ced9 100644
--- a/tests/support/cobs/patch.ts
+++ b/tests/support/cobs/patch.ts
@@ -41,13 +41,3 @@ export async function merge(
   await peer.git(["merge", featureBranch], options);
   await peer.git(["push", "rad", targetBranch], options);
 }
-
-export async function update(
-  peer: RadiclePeer,
-  featureBranch: string,
-  message: string,
-  options: Options,
-): Promise<void> {
-  await peer.git(["commit", "--allow-empty", "-m", message], options);
-  await peer.git(["push", "rad", featureBranch], options);
-}
diff --git a/tests/support/fixtures.ts b/tests/support/fixtures.ts
index e30a0dc85..97d2160d9 100644
--- a/tests/support/fixtures.ts
+++ b/tests/support/fixtures.ts
@@ -429,10 +429,14 @@ export async function createCobsFixture(peer: RadiclePeer) {
     ["review", patchThree, "-m", "This looks better"],
     createOptions(projectFolder, 2),
   );
-  await patch.update(
-    peer,
-    "feature/better-subtitle",
-    "Some minor rebase",
+  await Fs.appendFile(
+    Path.join(projectFolder, "README.md"),
+    "\n\nHad to push a new revision",
+  );
+  await peer.git(["add", "."], { cwd: projectFolder });
+  await peer.git(["commit", "-m", "Add more text"], { cwd: projectFolder });
+  await peer.git(
+    ["push", "rad", "feature/better-subtitle"],
     createOptions(projectFolder, 3),
   );