diff --git a/test/e2e/specs/site-editor/browser-history.spec.js b/test/e2e/specs/site-editor/browser-history.spec.js
index a2326d10e3cc51..b70674a7605ac3 100644
--- a/test/e2e/specs/site-editor/browser-history.spec.js
+++ b/test/e2e/specs/site-editor/browser-history.spec.js
@@ -19,7 +19,9 @@ test.describe( 'Site editor browser history', () => {
 
 		// Navigate to a single template
 		await page.click( 'role=button[name="Templates"]' );
-		await page.getByRole( 'link', { name: 'Index' } ).click();
+		await page
+			.locator( '.fields-title-field', { hasText: 'Index' } )
+			.click();
 		await expect( page ).toHaveURL(
 			'/wp-admin/site-editor.php?p=%2Fwp_template%2Femptytheme%2F%2Findex&canvas=edit'
 		);
diff --git a/test/e2e/specs/site-editor/new-templates-list.spec.js b/test/e2e/specs/site-editor/new-templates-list.spec.js
index 6faa85a2659cf1..cca8847a2333c5 100644
--- a/test/e2e/specs/site-editor/new-templates-list.spec.js
+++ b/test/e2e/specs/site-editor/new-templates-list.spec.js
@@ -27,13 +27,7 @@ test.describe( 'Templates', () => {
 			page.locator( '[aria-label="Templates"]' )
 		).toBeVisible();
 
-		const firstTitle = page
-			.getByRole( 'region', {
-				name: 'Template',
-				includeHidden: true,
-			} )
-			.getByRole( 'link', { includeHidden: true } )
-			.first();
+		const firstTitle = page.locator( '.fields-title-field' ).first();
 
 		// Descending by title.
 		await page.getByRole( 'button', { name: 'View options' } ).click();
@@ -54,9 +48,7 @@ test.describe( 'Templates', () => {
 		await admin.visitSiteEditor( { postType: 'wp_template' } );
 		// Global search.
 		await page.getByRole( 'searchbox', { name: 'Search' } ).fill( 'tag' );
-		const titles = page
-			.getByRole( 'region', { name: 'Template' } )
-			.getByRole( 'link', { includeHidden: true } );
+		const titles = page.locator( '.fields-title-field' );
 		await expect( titles ).toHaveCount( 1 );
 		await expect( titles.first() ).toHaveText( 'Tag Archives' );
 		await page
diff --git a/test/e2e/specs/site-editor/template-registration.spec.js b/test/e2e/specs/site-editor/template-registration.spec.js
index 90e56645813c30..86f71bcfebb1c7 100644
--- a/test/e2e/specs/site-editor/template-registration.spec.js
+++ b/test/e2e/specs/site-editor/template-registration.spec.js
@@ -319,7 +319,7 @@ test.describe( 'Block template registration', () => {
 			.getByLabel( 'Dismiss this notice' )
 			.getByText( `"Author: Admin" reset.` );
 		await page.getByPlaceholder( 'Search' ).fill( 'Author: admin' );
-		await page.getByRole( 'link', { name: 'Author: Admin' } ).click();
+		await page.getByRole( 'button', { name: 'Author: Admin' } ).click();
 		const actions = page.getByLabel( 'Actions' );
 		await actions.first().click();
 		await page.getByRole( 'menuitem', { name: 'Reset' } ).click();