diff --git a/tests/phpunit/tests/theme/customHeader.php b/tests/phpunit/tests/theme/customHeader.php
index cab863a563..d59cab0eea 100644
--- a/tests/phpunit/tests/theme/customHeader.php
+++ b/tests/phpunit/tests/theme/customHeader.php
@@ -2,7 +2,7 @@
 /**
  * @group themes
  */
-class Tests_Theme_Custom_Header extends WP_UnitTestCase {
+class Tests_Theme_CustomHeader extends WP_UnitTestCase {
 
 	public static $post;
 
diff --git a/tests/phpunit/tests/theme/getThemeStarterContent.php b/tests/phpunit/tests/theme/getThemeStarterContent.php
index a0425c8748..0ab6ad84ab 100644
--- a/tests/phpunit/tests/theme/getThemeStarterContent.php
+++ b/tests/phpunit/tests/theme/getThemeStarterContent.php
@@ -5,7 +5,7 @@
  *
  * @group themes
  */
-class Tests_WP_Theme_Get_Theme_Starter_Content extends WP_UnitTestCase {
+class Tests_Theme_GetThemeStarterContent extends WP_UnitTestCase {
 
 	/**
 	 * Testing passing an empty array as starter content.
diff --git a/tests/phpunit/tests/theme/getAllowedFilters.php b/tests/phpunit/tests/theme/wpThemeGetAllowedFilters.php
similarity index 97%
rename from tests/phpunit/tests/theme/getAllowedFilters.php
rename to tests/phpunit/tests/theme/wpThemeGetAllowedFilters.php
index 212d44ccb9..73c84c57bd 100644
--- a/tests/phpunit/tests/theme/getAllowedFilters.php
+++ b/tests/phpunit/tests/theme/wpThemeGetAllowedFilters.php
@@ -6,7 +6,7 @@ if ( is_multisite() ) :
 	 * @group themes
 	 * @group multisite
 	 */
-	class Tests_WP_Theme_Get_Allowed_Filters extends WP_UnitTestCase {
+	class Tests_Theme_wpThemeGetAllowedFilters extends WP_UnitTestCase {
 		/**
 		 * @array List of themes allowed before filters are applied.
 		 */