diff --git a/packages/e2e-test-utils-playwright/src/editor/publish-post.ts b/packages/e2e-test-utils-playwright/src/editor/publish-post.ts
index bf4b240a3fd619..81451cd516f0ed 100644
--- a/packages/e2e-test-utils-playwright/src/editor/publish-post.ts
+++ b/packages/e2e-test-utils-playwright/src/editor/publish-post.ts
@@ -16,7 +16,7 @@ export async function publishPost( this: Editor ) {
 		.getByRole( 'button', { name: 'Save', exact: true } );
 	const publishButton = this.page
 		.getByRole( 'region', { name: 'Editor top bar' } )
-		.getByRole( 'button', { name: 'Publish' } );
+		.getByRole( 'button', { name: 'Publish', exact: true } );
 	const buttonToClick = ( await saveButton.isVisible() )
 		? saveButton
 		: publishButton;
diff --git a/test/e2e/specs/site-editor/block-removal.spec.js b/test/e2e/specs/site-editor/block-removal.spec.js
index 2b149bcc69bf3e..7d656fbd2774ff 100644
--- a/test/e2e/specs/site-editor/block-removal.spec.js
+++ b/test/e2e/specs/site-editor/block-removal.spec.js
@@ -25,7 +25,9 @@ test.describe( 'Site editor block removal prompt', () => {
 	} ) => {
 		// Open and focus List View
 		const topBar = page.getByRole( 'region', { name: 'Editor top bar' } );
-		await topBar.getByRole( 'button', { name: 'List View' } ).click();
+		await topBar
+			.getByRole( 'button', { name: 'Document Overview' } )
+			.click();
 
 		// Select and try to remove Query Loop block
 		const listView = page.getByRole( 'region', { name: 'List View' } );
@@ -45,7 +47,9 @@ test.describe( 'Site editor block removal prompt', () => {
 	} ) => {
 		// Open and focus List View
 		const topBar = page.getByRole( 'region', { name: 'Editor top bar' } );
-		await topBar.getByRole( 'button', { name: 'List View' } ).click();
+		await topBar
+			.getByRole( 'button', { name: 'Document Overview' } )
+			.click();
 
 		// Select and open child blocks of Query Loop block
 		const listView = page.getByRole( 'region', { name: 'List View' } );
@@ -70,7 +74,9 @@ test.describe( 'Site editor block removal prompt', () => {
 	} ) => {
 		// Open and focus List View
 		const topBar = page.getByRole( 'region', { name: 'Editor top bar' } );
-		await topBar.getByRole( 'button', { name: 'List View' } ).click();
+		await topBar
+			.getByRole( 'button', { name: 'Document Overview' } )
+			.click();
 
 		// Select Query Loop list item
 		const listView = page.getByRole( 'region', { name: 'List View' } );
diff --git a/test/e2e/specs/site-editor/list-view.spec.js b/test/e2e/specs/site-editor/list-view.spec.js
index 9b7a1c17a9ce1d..9bccc7c56446a6 100644
--- a/test/e2e/specs/site-editor/list-view.spec.js
+++ b/test/e2e/specs/site-editor/list-view.spec.js
@@ -106,7 +106,7 @@ test.describe( 'Site Editor List View', () => {
 
 		// Focus should now be on the list view toggle button.
 		await expect(
-			page.getByRole( 'button', { name: 'List View' } )
+			page.getByRole( 'button', { name: 'Document Overview' } )
 		).toBeFocused();
 
 		// Open List View.
@@ -129,7 +129,7 @@ test.describe( 'Site Editor List View', () => {
 		await pageUtils.pressKeys( 'access+o' );
 		await expect( listView ).toBeHidden();
 		await expect(
-			page.getByRole( 'button', { name: 'List View' } )
+			page.getByRole( 'button', { name: 'Document Overview' } )
 		).toBeFocused();
 	} );
 } );
diff --git a/test/e2e/specs/site-editor/style-book.spec.js b/test/e2e/specs/site-editor/style-book.spec.js
index 4a5864755614b4..087013607be2f2 100644
--- a/test/e2e/specs/site-editor/style-book.spec.js
+++ b/test/e2e/specs/site-editor/style-book.spec.js
@@ -30,18 +30,12 @@ test.describe( 'Style Book', () => {
 	test( 'should disable toolbar buttons when open', async ( { page } ) => {
 		await expect(
 			page.locator( 'role=button[name="Toggle block inserter"i]' )
-		).toBeHidden();
+		).toBeDisabled();
 		await expect(
 			page.locator( 'role=button[name="Tools"i]' )
-		).toBeHidden();
-		await expect(
-			page.locator( 'role=button[name="Undo"i]' )
-		).toBeHidden();
-		await expect(
-			page.locator( 'role=button[name="Redo"i]' )
-		).toBeHidden();
+		).toBeDisabled();
 		await expect(
-			page.locator( 'role=button[name="View"i]' )
+			page.locator( 'role=button[name="Document Overview"i]' )
 		).toBeDisabled();
 	} );