diff --git a/packages/block-library/src/tab/save.js b/packages/block-library/src/tab/save.js
index 43454a04c2dcf8..752f24dfe038f6 100644
--- a/packages/block-library/src/tab/save.js
+++ b/packages/block-library/src/tab/save.js
@@ -8,7 +8,9 @@ export default function save( { attributes } ) {
 
 	const tabPanelId = anchor;
 
-	const blockProps = useBlockProps.save();
+	const blockProps = useBlockProps.save( {
+		role: 'tabpanel',
+	} );
 	const innerBlocksProps = useInnerBlocksProps.save( blockProps );
 
 	return <section { ...innerBlocksProps } id={ tabPanelId } />;
diff --git a/packages/block-library/src/tabs-menu-item/save.js b/packages/block-library/src/tabs-menu-item/save.js
index d67dffd14e6a25..38bd68dcae0910 100644
--- a/packages/block-library/src/tabs-menu-item/save.js
+++ b/packages/block-library/src/tabs-menu-item/save.js
@@ -1,7 +1,6 @@
 /**
  * WordPress dependencies
  */
-import { __ } from '@wordpress/i18n';
 import { useBlockProps } from '@wordpress/block-editor';
 
 export default function save( { attributes } ) {
@@ -27,20 +26,14 @@ export default function save( { attributes } ) {
 	}
 
 	// useBlockProps.save includes all core style engine classes and styles
-	// We add our custom classes and the hidden attribute for PHP template extraction
+	// The button content is replaced by PHP during rendering, so we output
+	// an empty button as a template.
 	const blockProps = useBlockProps.save( {
 		className: 'wp-block-tabs-menu-item__template',
 		style: customColorStyles,
-		hidden: true,
 		type: 'button',
 		role: 'tab',
 	} );
 
-	return (
-		<button { ...blockProps }>
-			<span className="screen-reader-text">
-				{ __( 'Tab menu item' ) }
-			</span>
-		</button>
-	);
+	return <button { ...blockProps } />;
 }
diff --git a/test/integration/fixtures/blocks/core__tab-panel.html b/test/integration/fixtures/blocks/core__tab-panel.html
index cdaa4f7164488f..fbf0a37d6cc621 100644
--- a/test/integration/fixtures/blocks/core__tab-panel.html
+++ b/test/integration/fixtures/blocks/core__tab-panel.html
@@ -1,7 +1,7 @@
 <!-- wp:tab-panel -->
 <div class="wp-block-tab-panel">
 	<!-- wp:tab {"label":"Tab 1"} -->
-	<section class="wp-block-tab">
+	<section role="tabpanel" class="wp-block-tab">
 		<!-- wp:paragraph -->
 		<p>Content inside the tab panel.</p>
 		<!-- /wp:paragraph -->
diff --git a/test/integration/fixtures/blocks/core__tab-panel.parsed.json b/test/integration/fixtures/blocks/core__tab-panel.parsed.json
index 61a157a1f34cfa..ef9b3047fdb09d 100644
--- a/test/integration/fixtures/blocks/core__tab-panel.parsed.json
+++ b/test/integration/fixtures/blocks/core__tab-panel.parsed.json
@@ -19,9 +19,9 @@
 						]
 					}
 				],
-				"innerHTML": "\n\t<section class=\"wp-block-tab\">\n\t\t\n\t</section>\n\t",
+				"innerHTML": "\n\t<section role=\"tabpanel\" class=\"wp-block-tab\">\n\t\t\n\t</section>\n\t",
 				"innerContent": [
-					"\n\t<section class=\"wp-block-tab\">\n\t\t",
+					"\n\t<section role=\"tabpanel\" class=\"wp-block-tab\">\n\t\t",
 					null,
 					"\n\t</section>\n\t"
 				]
diff --git a/test/integration/fixtures/blocks/core__tab-panel.serialized.html b/test/integration/fixtures/blocks/core__tab-panel.serialized.html
index 7d43408ca4a283..93dc8714c2b3cd 100644
--- a/test/integration/fixtures/blocks/core__tab-panel.serialized.html
+++ b/test/integration/fixtures/blocks/core__tab-panel.serialized.html
@@ -1,6 +1,6 @@
 <!-- wp:tab-panel -->
 <div class="wp-block-tab-panel"><!-- wp:tab {"label":"Tab 1"} -->
-<section class="wp-block-tab"><!-- wp:paragraph -->
+<section role="tabpanel" class="wp-block-tab"><!-- wp:paragraph -->
 <p>Content inside the tab panel.</p>
 <!-- /wp:paragraph --></section>
 <!-- /wp:tab --></div>
diff --git a/test/integration/fixtures/blocks/core__tab.html b/test/integration/fixtures/blocks/core__tab.html
index ecaad480417f3d..4049842605c3a1 100644
--- a/test/integration/fixtures/blocks/core__tab.html
+++ b/test/integration/fixtures/blocks/core__tab.html
@@ -1,5 +1,5 @@
 <!-- wp:tab {"label":"Tab Label"} -->
-<section class="wp-block-tab">
+<section role="tabpanel" class="wp-block-tab">
 	<!-- wp:paragraph -->
 	<p>Tab content goes here.</p>
 	<!-- /wp:paragraph -->
diff --git a/test/integration/fixtures/blocks/core__tab.parsed.json b/test/integration/fixtures/blocks/core__tab.parsed.json
index 21babef7e47170..d46e77f02129ed 100644
--- a/test/integration/fixtures/blocks/core__tab.parsed.json
+++ b/test/integration/fixtures/blocks/core__tab.parsed.json
@@ -13,9 +13,9 @@
 				"innerContent": [ "\n\t<p>Tab content goes here.</p>\n\t" ]
 			}
 		],
-		"innerHTML": "\n<section class=\"wp-block-tab\">\n\t\n</section>\n",
+		"innerHTML": "\n<section role=\"tabpanel\" class=\"wp-block-tab\">\n\t\n</section>\n",
 		"innerContent": [
-			"\n<section class=\"wp-block-tab\">\n\t",
+			"\n<section role=\"tabpanel\" class=\"wp-block-tab\">\n\t",
 			null,
 			"\n</section>\n"
 		]
diff --git a/test/integration/fixtures/blocks/core__tab.serialized.html b/test/integration/fixtures/blocks/core__tab.serialized.html
index a95fab11f9b98a..c9684a32c4270c 100644
--- a/test/integration/fixtures/blocks/core__tab.serialized.html
+++ b/test/integration/fixtures/blocks/core__tab.serialized.html
@@ -1,5 +1,5 @@
 <!-- wp:tab {"label":"Tab Label"} -->
-<section class="wp-block-tab"><!-- wp:paragraph -->
+<section role="tabpanel" class="wp-block-tab"><!-- wp:paragraph -->
 <p>Tab content goes here.</p>
 <!-- /wp:paragraph --></section>
 <!-- /wp:tab -->
diff --git a/test/integration/fixtures/blocks/core__tabs-menu-item.html b/test/integration/fixtures/blocks/core__tabs-menu-item.html
index 269cb74475024b..95abbe8b36c521 100644
--- a/test/integration/fixtures/blocks/core__tabs-menu-item.html
+++ b/test/integration/fixtures/blocks/core__tabs-menu-item.html
@@ -1,3 +1,3 @@
 <!-- wp:tabs-menu-item -->
-<button class="wp-block-tabs-menu-item wp-block-tabs-menu-item__template" hidden type="button" role="tab"><span class="screen-reader-text">Tab menu item</span></button>
+<button class="wp-block-tabs-menu-item wp-block-tabs-menu-item__template" type="button" role="tab"></button>
 <!-- /wp:tabs-menu-item -->
diff --git a/test/integration/fixtures/blocks/core__tabs-menu-item.parsed.json b/test/integration/fixtures/blocks/core__tabs-menu-item.parsed.json
index 876070e849df0f..7bbc0fa87c486d 100644
--- a/test/integration/fixtures/blocks/core__tabs-menu-item.parsed.json
+++ b/test/integration/fixtures/blocks/core__tabs-menu-item.parsed.json
@@ -3,9 +3,9 @@
 		"blockName": "core/tabs-menu-item",
 		"attrs": {},
 		"innerBlocks": [],
-		"innerHTML": "\n<button class=\"wp-block-tabs-menu-item wp-block-tabs-menu-item__template\" hidden type=\"button\" role=\"tab\"><span class=\"screen-reader-text\">Tab menu item</span></button>\n",
+		"innerHTML": "\n<button class=\"wp-block-tabs-menu-item wp-block-tabs-menu-item__template\" type=\"button\" role=\"tab\"></button>\n",
 		"innerContent": [
-			"\n<button class=\"wp-block-tabs-menu-item wp-block-tabs-menu-item__template\" hidden type=\"button\" role=\"tab\"><span class=\"screen-reader-text\">Tab menu item</span></button>\n"
+			"\n<button class=\"wp-block-tabs-menu-item wp-block-tabs-menu-item__template\" type=\"button\" role=\"tab\"></button>\n"
 		]
 	}
 ]
diff --git a/test/integration/fixtures/blocks/core__tabs-menu-item.serialized.html b/test/integration/fixtures/blocks/core__tabs-menu-item.serialized.html
index 269cb74475024b..95abbe8b36c521 100644
--- a/test/integration/fixtures/blocks/core__tabs-menu-item.serialized.html
+++ b/test/integration/fixtures/blocks/core__tabs-menu-item.serialized.html
@@ -1,3 +1,3 @@
 <!-- wp:tabs-menu-item -->
-<button class="wp-block-tabs-menu-item wp-block-tabs-menu-item__template" hidden type="button" role="tab"><span class="screen-reader-text">Tab menu item</span></button>
+<button class="wp-block-tabs-menu-item wp-block-tabs-menu-item__template" type="button" role="tab"></button>
 <!-- /wp:tabs-menu-item -->
diff --git a/test/integration/fixtures/blocks/core__tabs-menu.html b/test/integration/fixtures/blocks/core__tabs-menu.html
index 9ea80385fd9a6c..7daf799dceaa91 100644
--- a/test/integration/fixtures/blocks/core__tabs-menu.html
+++ b/test/integration/fixtures/blocks/core__tabs-menu.html
@@ -1,11 +1,11 @@
 <!-- wp:tabs-menu -->
 <div class="wp-block-tabs-menu" role="tablist">
 	<!-- wp:tabs-menu-item -->
-	<button class="wp-block-tabs-menu-item wp-block-tabs-menu-item__template" hidden type="button" role="tab"><span class="screen-reader-text">Tab menu item</span></button>
+	<button class="wp-block-tabs-menu-item wp-block-tabs-menu-item__template" type="button" role="tab"></button>
 	<!-- /wp:tabs-menu-item -->
 
 	<!-- wp:tabs-menu-item -->
-	<button class="wp-block-tabs-menu-item wp-block-tabs-menu-item__template" hidden type="button" role="tab"><span class="screen-reader-text">Tab menu item</span></button>
+	<button class="wp-block-tabs-menu-item wp-block-tabs-menu-item__template" type="button" role="tab"></button>
 	<!-- /wp:tabs-menu-item -->
 </div>
 <!-- /wp:tabs-menu -->
diff --git a/test/integration/fixtures/blocks/core__tabs-menu.parsed.json b/test/integration/fixtures/blocks/core__tabs-menu.parsed.json
index 26544117ae34c1..582785ebc658cd 100644
--- a/test/integration/fixtures/blocks/core__tabs-menu.parsed.json
+++ b/test/integration/fixtures/blocks/core__tabs-menu.parsed.json
@@ -7,18 +7,18 @@
 				"blockName": "core/tabs-menu-item",
 				"attrs": {},
 				"innerBlocks": [],
-				"innerHTML": "\n\t<button class=\"wp-block-tabs-menu-item wp-block-tabs-menu-item__template\" hidden type=\"button\" role=\"tab\"><span class=\"screen-reader-text\">Tab menu item</span></button>\n\t",
+				"innerHTML": "\n\t<button class=\"wp-block-tabs-menu-item wp-block-tabs-menu-item__template\" type=\"button\" role=\"tab\"></button>\n\t",
 				"innerContent": [
-					"\n\t<button class=\"wp-block-tabs-menu-item wp-block-tabs-menu-item__template\" hidden type=\"button\" role=\"tab\"><span class=\"screen-reader-text\">Tab menu item</span></button>\n\t"
+					"\n\t<button class=\"wp-block-tabs-menu-item wp-block-tabs-menu-item__template\" type=\"button\" role=\"tab\"></button>\n\t"
 				]
 			},
 			{
 				"blockName": "core/tabs-menu-item",
 				"attrs": {},
 				"innerBlocks": [],
-				"innerHTML": "\n\t<button class=\"wp-block-tabs-menu-item wp-block-tabs-menu-item__template\" hidden type=\"button\" role=\"tab\"><span class=\"screen-reader-text\">Tab menu item</span></button>\n\t",
+				"innerHTML": "\n\t<button class=\"wp-block-tabs-menu-item wp-block-tabs-menu-item__template\" type=\"button\" role=\"tab\"></button>\n\t",
 				"innerContent": [
-					"\n\t<button class=\"wp-block-tabs-menu-item wp-block-tabs-menu-item__template\" hidden type=\"button\" role=\"tab\"><span class=\"screen-reader-text\">Tab menu item</span></button>\n\t"
+					"\n\t<button class=\"wp-block-tabs-menu-item wp-block-tabs-menu-item__template\" type=\"button\" role=\"tab\"></button>\n\t"
 				]
 			}
 		],
diff --git a/test/integration/fixtures/blocks/core__tabs-menu.serialized.html b/test/integration/fixtures/blocks/core__tabs-menu.serialized.html
index 47a5dad676ddcc..0f2cebe1424b1f 100644
--- a/test/integration/fixtures/blocks/core__tabs-menu.serialized.html
+++ b/test/integration/fixtures/blocks/core__tabs-menu.serialized.html
@@ -1,9 +1,9 @@
 <!-- wp:tabs-menu -->
 <div role="tablist" class="wp-block-tabs-menu"><!-- wp:tabs-menu-item -->
-<button class="wp-block-tabs-menu-item wp-block-tabs-menu-item__template" hidden type="button" role="tab"><span class="screen-reader-text">Tab menu item</span></button>
+<button class="wp-block-tabs-menu-item wp-block-tabs-menu-item__template" type="button" role="tab"></button>
 <!-- /wp:tabs-menu-item -->
 
 <!-- wp:tabs-menu-item -->
-<button class="wp-block-tabs-menu-item wp-block-tabs-menu-item__template" hidden type="button" role="tab"><span class="screen-reader-text">Tab menu item</span></button>
+<button class="wp-block-tabs-menu-item wp-block-tabs-menu-item__template" type="button" role="tab"></button>
 <!-- /wp:tabs-menu-item --></div>
 <!-- /wp:tabs-menu -->
diff --git a/test/integration/fixtures/blocks/core__tabs.html b/test/integration/fixtures/blocks/core__tabs.html
index 3aef5c57fc46a2..029f0b13a96bbe 100644
--- a/test/integration/fixtures/blocks/core__tabs.html
+++ b/test/integration/fixtures/blocks/core__tabs.html
@@ -3,7 +3,7 @@
 	<!-- wp:tabs-menu -->
 	<div class="wp-block-tabs-menu" role="tablist">
 		<!-- wp:tabs-menu-item -->
-		<button class="wp-block-tabs-menu-item wp-block-tabs-menu-item__template" hidden type="button" role="tab"><span class="screen-reader-text">Tab menu item</span></button>
+		<button class="wp-block-tabs-menu-item wp-block-tabs-menu-item__template" type="button" role="tab"></button>
 		<!-- /wp:tabs-menu-item -->
 	</div>
 	<!-- /wp:tabs-menu -->
@@ -11,7 +11,7 @@
 	<!-- wp:tab-panel -->
 	<div class="wp-block-tab-panel">
 		<!-- wp:tab {"label":"Tab 1"} -->
-		<section class="wp-block-tab">
+		<section role="tabpanel" class="wp-block-tab">
 			<!-- wp:paragraph -->
 			<p>Pariatur commodo sint mollit. Veniam Lorem labore voluptate fugiat. Ad nulla est labore cillum cillum qui nostrud do incididunt eiusmod.</p>
 			<!-- /wp:paragraph -->
@@ -19,11 +19,11 @@
 		<!-- /wp:tab -->
 
 		<!-- wp:tab {"label":"Tab 2"} -->
-		<section class="wp-block-tab"></section>
+		<section role="tabpanel" class="wp-block-tab"></section>
 		<!-- /wp:tab -->
 
 		<!-- wp:tab {"label":"Tab 3"} -->
-		<section class="wp-block-tab"></section>
+		<section role="tabpanel" class="wp-block-tab"></section>
 		<!-- /wp:tab -->
 	</div>
 	<!-- /wp:tab-panel -->
diff --git a/test/integration/fixtures/blocks/core__tabs.parsed.json b/test/integration/fixtures/blocks/core__tabs.parsed.json
index 78bcd77b76ea9f..918a0cfe31a0c2 100644
--- a/test/integration/fixtures/blocks/core__tabs.parsed.json
+++ b/test/integration/fixtures/blocks/core__tabs.parsed.json
@@ -11,9 +11,9 @@
 						"blockName": "core/tabs-menu-item",
 						"attrs": {},
 						"innerBlocks": [],
-						"innerHTML": "\n\t\t<button class=\"wp-block-tabs-menu-item wp-block-tabs-menu-item__template\" hidden type=\"button\" role=\"tab\"><span class=\"screen-reader-text\">Tab menu item</span></button>\n\t\t",
+						"innerHTML": "\n\t\t<button class=\"wp-block-tabs-menu-item wp-block-tabs-menu-item__template\" type=\"button\" role=\"tab\"></button>\n\t\t",
 						"innerContent": [
-							"\n\t\t<button class=\"wp-block-tabs-menu-item wp-block-tabs-menu-item__template\" hidden type=\"button\" role=\"tab\"><span class=\"screen-reader-text\">Tab menu item</span></button>\n\t\t"
+							"\n\t\t<button class=\"wp-block-tabs-menu-item wp-block-tabs-menu-item__template\" type=\"button\" role=\"tab\"></button>\n\t\t"
 						]
 					}
 				],
@@ -44,9 +44,9 @@
 								]
 							}
 						],
-						"innerHTML": "\n\t\t<section class=\"wp-block-tab\">\n\t\t\t\n\t\t</section>\n\t\t",
+						"innerHTML": "\n\t\t<section role=\"tabpanel\" class=\"wp-block-tab\">\n\t\t\t\n\t\t</section>\n\t\t",
 						"innerContent": [
-							"\n\t\t<section class=\"wp-block-tab\">\n\t\t\t",
+							"\n\t\t<section role=\"tabpanel\" class=\"wp-block-tab\">\n\t\t\t",
 							null,
 							"\n\t\t</section>\n\t\t"
 						]
@@ -57,9 +57,9 @@
 							"label": "Tab 2"
 						},
 						"innerBlocks": [],
-						"innerHTML": "\n\t\t<section class=\"wp-block-tab\"></section>\n\t\t",
+						"innerHTML": "\n\t\t<section role=\"tabpanel\" class=\"wp-block-tab\"></section>\n\t\t",
 						"innerContent": [
-							"\n\t\t<section class=\"wp-block-tab\"></section>\n\t\t"
+							"\n\t\t<section role=\"tabpanel\" class=\"wp-block-tab\"></section>\n\t\t"
 						]
 					},
 					{
@@ -68,9 +68,9 @@
 							"label": "Tab 3"
 						},
 						"innerBlocks": [],
-						"innerHTML": "\n\t\t<section class=\"wp-block-tab\"></section>\n\t\t",
+						"innerHTML": "\n\t\t<section role=\"tabpanel\" class=\"wp-block-tab\"></section>\n\t\t",
 						"innerContent": [
-							"\n\t\t<section class=\"wp-block-tab\"></section>\n\t\t"
+							"\n\t\t<section role=\"tabpanel\" class=\"wp-block-tab\"></section>\n\t\t"
 						]
 					}
 				],
diff --git a/test/integration/fixtures/blocks/core__tabs.serialized.html b/test/integration/fixtures/blocks/core__tabs.serialized.html
index fa2d1c3952ebfe..3e8aafc0da6261 100644
--- a/test/integration/fixtures/blocks/core__tabs.serialized.html
+++ b/test/integration/fixtures/blocks/core__tabs.serialized.html
@@ -1,23 +1,23 @@
 <!-- wp:tabs -->
 <div class="wp-block-tabs"><!-- wp:tabs-menu -->
 <div role="tablist" class="wp-block-tabs-menu"><!-- wp:tabs-menu-item -->
-<button class="wp-block-tabs-menu-item wp-block-tabs-menu-item__template" hidden type="button" role="tab"><span class="screen-reader-text">Tab menu item</span></button>
+<button class="wp-block-tabs-menu-item wp-block-tabs-menu-item__template" type="button" role="tab"></button>
 <!-- /wp:tabs-menu-item --></div>
 <!-- /wp:tabs-menu -->
 
 <!-- wp:tab-panel -->
 <div class="wp-block-tab-panel"><!-- wp:tab {"label":"Tab 1"} -->
-<section class="wp-block-tab"><!-- wp:paragraph -->
+<section role="tabpanel" class="wp-block-tab"><!-- wp:paragraph -->
 <p>Pariatur commodo sint mollit. Veniam Lorem labore voluptate fugiat. Ad nulla est labore cillum cillum qui nostrud do incididunt eiusmod.</p>
 <!-- /wp:paragraph --></section>
 <!-- /wp:tab -->
 
 <!-- wp:tab {"label":"Tab 2"} -->
-<section class="wp-block-tab"></section>
+<section role="tabpanel" class="wp-block-tab"></section>
 <!-- /wp:tab -->
 
 <!-- wp:tab {"label":"Tab 3"} -->
-<section class="wp-block-tab"></section>
+<section role="tabpanel" class="wp-block-tab"></section>
 <!-- /wp:tab --></div>
 <!-- /wp:tab-panel --></div>
 <!-- /wp:tabs -->