diff --git a/tests/phpunit/data/themedir1/test-block-child-theme/page-home.php b/tests/phpunit/data/themedir1/test-block-child-theme/page-home.php
deleted file mode 100644
index 86efe80db6..0000000000
--- a/tests/phpunit/data/themedir1/test-block-child-theme/page-home.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-echo 'PHP template for page with slug "home"';
diff --git a/tests/phpunit/data/themedir1/test-block-child-theme/style.css b/tests/phpunit/data/themedir1/test-block-child-theme/style.css
deleted file mode 100644
index 069ce2d03f..0000000000
--- a/tests/phpunit/data/themedir1/test-block-child-theme/style.css
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
-Theme Name: Test Block Child Theme
-Template: test-block-theme
-*/
diff --git a/tests/phpunit/data/themedir1/test-block-child-theme/templates/page-1.html b/tests/phpunit/data/themedir1/test-block-child-theme/templates/page-1.html
deleted file mode 100644
index c3e788b393..0000000000
--- a/tests/phpunit/data/themedir1/test-block-child-theme/templates/page-1.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- wp:paragraph -->
-<p>Page (ID 1) Template</p>
-<!-- /wp:paragraph -->
\ No newline at end of file
diff --git a/tests/phpunit/data/themedir1/test-block-theme/index.php b/tests/phpunit/data/themedir1/test-block-theme/index.php
deleted file mode 100644
index 634710b208..0000000000
--- a/tests/phpunit/data/themedir1/test-block-theme/index.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-// This file is for test purposes only.
diff --git a/tests/phpunit/data/themedir1/test-block-theme/page-1.php b/tests/phpunit/data/themedir1/test-block-theme/page-1.php
deleted file mode 100644
index eafbb1b6e8..0000000000
--- a/tests/phpunit/data/themedir1/test-block-theme/page-1.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-echo 'PHP template for page with ID 1';
diff --git a/tests/phpunit/data/themedir1/test-block-theme/style.css b/tests/phpunit/data/themedir1/test-block-theme/style.css
deleted file mode 100644
index ed6c348660..0000000000
--- a/tests/phpunit/data/themedir1/test-block-theme/style.css
+++ /dev/null
@@ -1,3 +0,0 @@
-/*
-Theme Name: Test Block Theme
-*/
diff --git a/tests/phpunit/data/themedir1/test-block-theme/templates/index.html b/tests/phpunit/data/themedir1/test-block-theme/templates/index.html
deleted file mode 100644
index e76bcaaf3a..0000000000
--- a/tests/phpunit/data/themedir1/test-block-theme/templates/index.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- wp:paragraph -->
-<p>Index Template</p>
-<!-- /wp:paragraph -->
\ No newline at end of file
diff --git a/tests/phpunit/data/themedir1/test-block-theme/templates/page-home.html b/tests/phpunit/data/themedir1/test-block-theme/templates/page-home.html
deleted file mode 100644
index 6be0c70fb2..0000000000
--- a/tests/phpunit/data/themedir1/test-block-theme/templates/page-home.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- wp:paragraph -->
-<p>Page (Home) Template</p>
-<!-- /wp:paragraph -->
\ No newline at end of file
diff --git a/tests/phpunit/data/themedir1/test-block-theme/templates/page.html b/tests/phpunit/data/themedir1/test-block-theme/templates/page.html
deleted file mode 100644
index 61c493e1bd..0000000000
--- a/tests/phpunit/data/themedir1/test-block-theme/templates/page.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- wp:paragraph -->
-<p>Page Template</p>
-<!-- /wp:paragraph -->
\ No newline at end of file
diff --git a/tests/phpunit/tests/theme/themeDir.php b/tests/phpunit/tests/theme/themeDir.php
index 5255037866..9311f6643a 100644
--- a/tests/phpunit/tests/theme/themeDir.php
+++ b/tests/phpunit/tests/theme/themeDir.php
@@ -163,8 +163,6 @@ class Tests_Theme_ThemeDir extends WP_UnitTestCase {
 			'REST Theme',
 			'Block Theme',
 			'Block Theme Child Theme',
-			'Test Block Theme',
-			'Test Block Child Theme',
 		);
 
 		sort( $theme_names );
diff --git a/tests/phpunit/tests/theme/wpTheme.php b/tests/phpunit/tests/theme/wpTheme.php
index 20e960bf3e..3fb1e6e4b7 100644
--- a/tests/phpunit/tests/theme/wpTheme.php
+++ b/tests/phpunit/tests/theme/wpTheme.php
@@ -273,11 +273,11 @@ class Tests_Theme_wpTheme extends WP_UnitTestCase {
 				'expected'  => false,
 			),
 			'parent block theme'        => array(
-				'theme_dir' => 'test-block-theme',
+				'theme_dir' => 'block-theme',
 				'expected'  => true,
 			),
 			'child block theme'         => array(
-				'theme_dir' => 'test-block-child-theme',
+				'theme_dir' => 'block-theme-child',
 				'expected'  => true,
 			),
 		);
@@ -312,14 +312,14 @@ class Tests_Theme_wpTheme extends WP_UnitTestCase {
 				'expected'  => '/nonexistent',
 			),
 			'parent theme: no file given'       => array(
-				'theme_dir' => 'test-block-theme',
+				'theme_dir' => 'block-theme',
 				'file'      => '',
-				'expected'  => '/test-block-theme',
+				'expected'  => '/block-theme',
 			),
 			'child theme: no file given'        => array(
-				'theme_dir' => 'test-block-child-theme',
+				'theme_dir' => 'block-theme-child',
 				'file'      => '',
-				'expected'  => '/test-block-child-theme',
+				'expected'  => '/block-theme-child',
 			),
 			'nonexistent theme: file given'     => array(
 				'theme_dir' => 'nonexistent',
@@ -327,29 +327,29 @@ class Tests_Theme_wpTheme extends WP_UnitTestCase {
 				'expected'  => '/nonexistent/templates/page.html',
 			),
 			'parent theme: file exists'         => array(
-				'theme_dir' => 'test-block-theme',
+				'theme_dir' => 'block-theme',
 				'file'      => '/templates/page-home.html',
-				'expected'  => '/test-block-theme/templates/page-home.html',
+				'expected'  => '/block-theme/templates/page-home.html',
 			),
 			'parent theme: file does not exist' => array(
-				'theme_dir' => 'test-block-theme',
+				'theme_dir' => 'block-theme',
 				'file'      => '/templates/nonexistent.html',
-				'expected'  => '/test-block-theme/templates/nonexistent.html',
+				'expected'  => '/block-theme/templates/nonexistent.html',
 			),
 			'child theme: file exists'          => array(
-				'theme_dir' => 'test-block-child-theme',
+				'theme_dir' => 'block-theme-child',
 				'file'      => '/templates/page-1.html',
-				'expected'  => '/test-block-child-theme/templates/page-1.html',
+				'expected'  => '/block-theme-child/templates/page-1.html',
 			),
 			'child theme: file does not exist'  => array(
-				'theme_dir' => 'test-block-child-theme',
+				'theme_dir' => 'block-theme-child',
 				'file'      => '/templates/nonexistent.html',
-				'expected'  => '/test-block-theme/templates/nonexistent.html',
+				'expected'  => '/block-theme/templates/nonexistent.html',
 			),
 			'child theme: file exists in parent, not in child' => array(
-				'theme_dir' => 'test-block-child-theme',
+				'theme_dir' => 'block-theme-child',
 				'file'      => '/templates/page.html',
-				'expected'  => '/test-block-theme/templates/page.html',
+				'expected'  => '/block-theme/templates/page.html',
 			),
 		);
 	}