diff --git a/tests/phpunit/tests/theme/wpThemeJson.php b/tests/phpunit/tests/theme/wpThemeJson.php
index 91125ef10e16a..1d881e3596502 100644
--- a/tests/phpunit/tests/theme/wpThemeJson.php
+++ b/tests/phpunit/tests/theme/wpThemeJson.php
@@ -2633,9 +2633,9 @@ function test_export_data_sets_appearance_tools() {
 	 * @param array $layout_definitions Layout definitions as stored in core theme.json.
 	 */
 	public function test_get_stylesheet_generates_layout_styles( $layout_definitions ) {
-		$theme_json = new WP_Theme_JSON_Gutenberg(
+		$theme_json = new WP_Theme_JSON(
 			array(
-				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'version'  => WP_Theme_JSON::LATEST_SCHEMA,
 				'settings' => array(
 					'layout'  => array(
 						'definitions' => $layout_definitions,
@@ -2668,9 +2668,9 @@ public function test_get_stylesheet_generates_layout_styles( $layout_definitions
 	 * @param array $layout_definitions Layout definitions as stored in core theme.json.
 	 */
 	public function test_get_stylesheet_generates_layout_styles_with_spacing_presets( $layout_definitions ) {
-		$theme_json = new WP_Theme_JSON_Gutenberg(
+		$theme_json = new WP_Theme_JSON(
 			array(
-				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'version'  => WP_Theme_JSON::LATEST_SCHEMA,
 				'settings' => array(
 					'layout'  => array(
 						'definitions' => $layout_definitions,
@@ -2703,9 +2703,9 @@ public function test_get_stylesheet_generates_layout_styles_with_spacing_presets
 	 * @param array $layout_definitions Layout definitions as stored in core theme.json.
 	 */
 	public function test_get_stylesheet_generates_fallback_gap_layout_styles( $layout_definitions ) {
-		$theme_json = new WP_Theme_JSON_Gutenberg(
+		$theme_json = new WP_Theme_JSON(
 			array(
-				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'version'  => WP_Theme_JSON::LATEST_SCHEMA,
 				'settings' => array(
 					'layout'  => array(
 						'definitions' => $layout_definitions,
@@ -2739,9 +2739,9 @@ public function test_get_stylesheet_generates_fallback_gap_layout_styles( $layou
 	 * @param array $layout_definitions Layout definitions as stored in core theme.json.
 	 */
 	public function test_get_stylesheet_generates_base_fallback_gap_layout_styles( $layout_definitions ) {
-		$theme_json = new WP_Theme_JSON_Gutenberg(
+		$theme_json = new WP_Theme_JSON(
 			array(
-				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'version'  => WP_Theme_JSON::LATEST_SCHEMA,
 				'settings' => array(
 					'layout'  => array(
 						'definitions' => $layout_definitions,
@@ -2771,9 +2771,9 @@ public function test_get_stylesheet_generates_base_fallback_gap_layout_styles( $
 	 */
 	public function test_get_stylesheet_skips_layout_styles( $layout_definitions ) {
 		add_theme_support( 'disable-layout-styles' );
-		$theme_json = new WP_Theme_JSON_Gutenberg(
+		$theme_json = new WP_Theme_JSON(
 			array(
-				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'version'  => WP_Theme_JSON::LATEST_SCHEMA,
 				'settings' => array(
 					'layout'  => array(
 						'definitions' => $layout_definitions,
@@ -2888,7 +2888,7 @@ public function data_get_layout_definitions() {
 	 * @dataProvider data_generate_spacing_scale_fixtures
 	 */
 	function test_set_spacing_sizes( $spacing_scale, $expected_output ) {
-		$theme_json = new WP_Theme_JSON_Gutenberg(
+		$theme_json = new WP_Theme_JSON(
 			array(
 				'version'  => 2,
 				'settings' => array(
@@ -3134,7 +3134,7 @@ public function test_set_spacing_sizes_when_invalid( $spacing_scale, $expected_o
 		$this->expectNotice();
 		$this->expectNoticeMessage( 'Some of the theme.json settings.spacing.spacingScale values are invalid' );
 
-		$theme_json = new WP_Theme_JSON_Gutenberg(
+		$theme_json = new WP_Theme_JSON(
 			array(
 				'version'  => 2,
 				'settings' => array(
@@ -3219,7 +3219,7 @@ function data_set_spacing_sizes_when_invalid() {
 	 * @ticket 56467
 	 */
 	function test_get_styles_for_block_with_padding_aware_alignments() {
-		$theme_json = new WP_Theme_JSON_Gutenberg(
+		$theme_json = new WP_Theme_JSON(
 			array(
 				'version'  => 2,
 				'styles'   => array(
@@ -3253,7 +3253,7 @@ function test_get_styles_for_block_with_padding_aware_alignments() {
 	 * @ticket 56467
 	 */
 	function test_get_styles_for_block_without_padding_aware_alignments() {
-		$theme_json = new WP_Theme_JSON_Gutenberg(
+		$theme_json = new WP_Theme_JSON(
 			array(
 				'version' => 2,
 				'styles'  => array(
@@ -3284,7 +3284,7 @@ function test_get_styles_for_block_without_padding_aware_alignments() {
 	 * @ticket 56467
 	 */
 	function test_get_styles_for_block_with_content_width() {
-		$theme_json = new WP_Theme_JSON_Gutenberg(
+		$theme_json = new WP_Theme_JSON(
 			array(
 				'version'  => 2,
 				'settings' => array(