diff --git a/packages/e2e-tests/specs/site-editor/settings-sidebar.test.js b/packages/e2e-tests/specs/site-editor/settings-sidebar.test.js
index 6b589ec7ea33d4..85831e9de4ac4f 100644
--- a/packages/e2e-tests/specs/site-editor/settings-sidebar.test.js
+++ b/packages/e2e-tests/specs/site-editor/settings-sidebar.test.js
@@ -19,8 +19,8 @@ async function toggleSidebar() {
 
 async function getActiveTabLabel() {
 	return await page.$eval(
-		'.edit-site-sidebar-edit-mode__panel-tab.is-active',
-		( element ) => element.getAttribute( 'aria-label' )
+		'div[aria-label="Editor settings"] [role="tab"][aria-selected="true"]',
+		( element ) => element.textContent
 	);
 }
 
@@ -57,9 +57,7 @@ describe( 'Settings sidebar', () => {
 		it( 'should open template tab by default if no block is selected', async () => {
 			await toggleSidebar();
 
-			expect( await getActiveTabLabel() ).toEqual(
-				'Template (selected)'
-			);
+			expect( await getActiveTabLabel() ).toEqual( 'Template' );
 		} );
 
 		it( "should show the currently selected template's title and description", async () => {
@@ -93,30 +91,26 @@ describe( 'Settings sidebar', () => {
 
 			await toggleSidebar();
 
-			expect( await getActiveTabLabel() ).toEqual( 'Block (selected)' );
+			expect( await getActiveTabLabel() ).toEqual( 'Block' );
 		} );
 	} );
 
 	describe( 'Tab switch based on selection', () => {
 		it( 'should switch to block tab if we select a block, when Template is selected', async () => {
 			await toggleSidebar();
-			expect( await getActiveTabLabel() ).toEqual(
-				'Template (selected)'
-			);
+			expect( await getActiveTabLabel() ).toEqual( 'Template' );
 			// By inserting the block is also selected.
 			await insertBlock( 'Heading' );
-			expect( await getActiveTabLabel() ).toEqual( 'Block (selected)' );
+			expect( await getActiveTabLabel() ).toEqual( 'Block' );
 		} );
 		it( 'should switch to Template tab when a block was selected and we select the Template', async () => {
 			await insertBlock( 'Heading' );
 			await toggleSidebar();
-			expect( await getActiveTabLabel() ).toEqual( 'Block (selected)' );
+			expect( await getActiveTabLabel() ).toEqual( 'Block' );
 			await page.evaluate( () => {
 				wp.data.dispatch( 'core/block-editor' ).clearSelectedBlock();
 			} );
-			expect( await getActiveTabLabel() ).toEqual(
-				'Template (selected)'
-			);
+			expect( await getActiveTabLabel() ).toEqual( 'Template' );
 		} );
 	} );
 } );
diff --git a/test/e2e/specs/site-editor/template-revert.spec.js b/test/e2e/specs/site-editor/template-revert.spec.js
index c281b71d16a183..4cc18448608015 100644
--- a/test/e2e/specs/site-editor/template-revert.spec.js
+++ b/test/e2e/specs/site-editor/template-revert.spec.js
@@ -294,12 +294,12 @@ class TemplateRevertUtils {
 		await this.editor.openDocumentSettingsSidebar();
 		const isTemplateTabVisible = await this.page
 			.locator(
-				'role=region[name="Editor settings"i] >> role=button[name="Template"i]'
+				'role=region[name="Editor settings"i] >> role=tab[name="Template"i]'
 			)
 			.isVisible();
 		if ( isTemplateTabVisible ) {
 			await this.page.click(
-				'role=region[name="Editor settings"i] >> role=button[name="Template"i]'
+				'role=region[name="Editor settings"i] >> role=tab[name="Template"i]'
 			);
 		}
 		await this.page.click(
diff --git a/test/e2e/specs/site-editor/writing-flow.spec.js b/test/e2e/specs/site-editor/writing-flow.spec.js
index 8ee6ce0e565572..75f8766891156b 100644
--- a/test/e2e/specs/site-editor/writing-flow.spec.js
+++ b/test/e2e/specs/site-editor/writing-flow.spec.js
@@ -65,9 +65,9 @@ test.describe( 'Site editor writing flow', () => {
 
 		// Tab to the inspector, tabbing three times to go past the two resize handles.
 		await pageUtils.pressKeys( 'Tab', { times: 3 } );
-		const inspectorTemplateTab = page.locator(
-			'role=region[name="Editor settings"i] >> role=button[name="Template part"i]'
+		const inspectorBlockTab = page.locator(
+			'role=region[name="Editor settings"i] >> role=tab[name="Block"i]'
 		);
-		await expect( inspectorTemplateTab ).toBeFocused();
+		await expect( inspectorBlockTab ).toBeFocused();
 	} );
 } );