diff --git a/tests/phpunit/tests/multisite/cleanDirsizeCache.php b/tests/phpunit/tests/multisite/cleanDirsizeCache.php
index 8aaa596d39..958908f468 100644
--- a/tests/phpunit/tests/multisite/cleanDirsizeCache.php
+++ b/tests/phpunit/tests/multisite/cleanDirsizeCache.php
@@ -8,7 +8,7 @@ if ( is_multisite() ) :
 	 * @ticket 19879
 	 * @group multisite
 	 */
-	class Tests_Multisite_Dirsize_Cache extends WP_UnitTestCase {
+	class Tests_Multisite_CleanDirsizeCache extends WP_UnitTestCase {
 		protected $suppress = false;
 
 		function set_up() {
diff --git a/tests/phpunit/tests/multisite/getBlogDetails.php b/tests/phpunit/tests/multisite/getBlogDetails.php
index 358499e55a..b4c456f082 100644
--- a/tests/phpunit/tests/multisite/getBlogDetails.php
+++ b/tests/phpunit/tests/multisite/getBlogDetails.php
@@ -7,7 +7,7 @@ if ( is_multisite() ) :
 	 * @group ms-site
 	 * @group multisite
 	 */
-	class Tests_Multisite_Get_Blog_Details extends WP_UnitTestCase {
+	class Tests_Multisite_GetBlogDetails extends WP_UnitTestCase {
 		protected static $network_ids;
 		protected static $site_ids;
 
diff --git a/tests/phpunit/tests/multisite/getIdFromBlogname.php b/tests/phpunit/tests/multisite/getIdFromBlogname.php
index 29d7c8c761..49b4bf6f85 100644
--- a/tests/phpunit/tests/multisite/getIdFromBlogname.php
+++ b/tests/phpunit/tests/multisite/getIdFromBlogname.php
@@ -8,7 +8,7 @@ if ( is_multisite() ) :
 	 * @group ms-site
 	 * @group multisite
 	 */
-	class Tests_Multisite_Get_Id_From_Blogname extends WP_UnitTestCase {
+	class Tests_Multisite_GetIdFromBlogname extends WP_UnitTestCase {
 		protected static $network_ids;
 		protected static $site_ids;
 
diff --git a/tests/phpunit/tests/multisite/getMainSiteId.php b/tests/phpunit/tests/multisite/getMainSiteId.php
index 63e68ef163..3a6e9c4d8c 100644
--- a/tests/phpunit/tests/multisite/getMainSiteId.php
+++ b/tests/phpunit/tests/multisite/getMainSiteId.php
@@ -8,7 +8,7 @@ if ( is_multisite() ) :
 	 * @group ms-site
 	 * @group multisite
 	 */
-	class Tests_Multisite_Get_Main_Site_ID extends WP_UnitTestCase {
+	class Tests_Multisite_GetMainSiteId extends WP_UnitTestCase {
 		protected static $network_ids;
 		protected static $site_ids;
 
diff --git a/tests/phpunit/tests/multisite/getSite.php b/tests/phpunit/tests/multisite/getSite.php
index f1c4779d6b..46a5121247 100644
--- a/tests/phpunit/tests/multisite/getSite.php
+++ b/tests/phpunit/tests/multisite/getSite.php
@@ -7,7 +7,7 @@ if ( is_multisite() ) :
 	 * @group ms-site
 	 * @group multisite
 	 */
-	class Tests_Multisite_Get_Site extends WP_UnitTestCase {
+	class Tests_Multisite_GetSite extends WP_UnitTestCase {
 		protected static $site_ids;
 
 		public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
diff --git a/tests/phpunit/tests/multisite/getSpaceAllowed.php b/tests/phpunit/tests/multisite/getSpaceAllowed.php
index 735e4320c2..97b09ab00c 100644
--- a/tests/phpunit/tests/multisite/getSpaceAllowed.php
+++ b/tests/phpunit/tests/multisite/getSpaceAllowed.php
@@ -7,7 +7,7 @@ if ( is_multisite() ) :
 	 *
 	 * @group multisite
 	 */
-	class Tests_Multisite_Get_Space_Allowed extends WP_UnitTestCase {
+	class Tests_Multisite_GetSpaceAllowed extends WP_UnitTestCase {
 		protected $suppress = false;
 
 		public function set_up() {
diff --git a/tests/phpunit/tests/multisite/getSpaceUsed.php b/tests/phpunit/tests/multisite/getSpaceUsed.php
index b6492d661e..7bad089572 100644
--- a/tests/phpunit/tests/multisite/getSpaceUsed.php
+++ b/tests/phpunit/tests/multisite/getSpaceUsed.php
@@ -6,7 +6,7 @@ if ( is_multisite() ) :
 	 * @group multisite
 	 * @covers ::get_space_used
 	 */
-	class Tests_Multisite_Get_Space_Used extends WP_UnitTestCase {
+	class Tests_Multisite_GetSpaceUsed extends WP_UnitTestCase {
 		protected $suppress = false;
 
 		function set_up() {
diff --git a/tests/phpunit/tests/multisite/isUploadSpaceAvailable.php b/tests/phpunit/tests/multisite/isUploadSpaceAvailable.php
index d520791879..796bf0f736 100644
--- a/tests/phpunit/tests/multisite/isUploadSpaceAvailable.php
+++ b/tests/phpunit/tests/multisite/isUploadSpaceAvailable.php
@@ -10,7 +10,7 @@ if ( is_multisite() ) :
 	 *
 	 * @group multisite
 	 */
-	class Tests_Multisite_Is_Upload_Space_Available extends WP_UnitTestCase {
+	class Tests_Multisite_IsUploadSpaceAvailable extends WP_UnitTestCase {
 		protected $suppress = false;
 
 		public function set_up() {
diff --git a/tests/phpunit/tests/multisite/ms-files-rewriting.php b/tests/phpunit/tests/multisite/msFilesRewriting.php
similarity index 97%
rename from tests/phpunit/tests/multisite/ms-files-rewriting.php
rename to tests/phpunit/tests/multisite/msFilesRewriting.php
index 4288d2ef61..050ae44bb9 100644
--- a/tests/phpunit/tests/multisite/ms-files-rewriting.php
+++ b/tests/phpunit/tests/multisite/msFilesRewriting.php
@@ -11,7 +11,7 @@ if ( is_multisite() ) :
 	 * @group ms-files
 	 * @group multisite
 	 */
-	class Tests_Multisite_MS_Files_Rewriting extends WP_UnitTestCase {
+	class Tests_Multisite_msFilesRewriting extends WP_UnitTestCase {
 		protected $suppress = false;
 
 		function set_up() {
diff --git a/tests/phpunit/tests/multisite/siteDetails.php b/tests/phpunit/tests/multisite/siteDetails.php
index 78b392c487..d8eb84382b 100644
--- a/tests/phpunit/tests/multisite/siteDetails.php
+++ b/tests/phpunit/tests/multisite/siteDetails.php
@@ -7,7 +7,7 @@ if ( is_multisite() ) :
 	 * @group ms-site
 	 * @group multisite
 	 */
-	class Tests_Multisite_Site_Details extends WP_UnitTestCase {
+	class Tests_Multisite_SiteDetails extends WP_UnitTestCase {
 		/**
 		 * @dataProvider data_allowed_options
 		 *
diff --git a/tests/phpunit/tests/multisite/siteMeta.php b/tests/phpunit/tests/multisite/siteMeta.php
index 72d86f6a47..4a1a30fee2 100644
--- a/tests/phpunit/tests/multisite/siteMeta.php
+++ b/tests/phpunit/tests/multisite/siteMeta.php
@@ -8,7 +8,7 @@ if ( is_multisite() ) :
 	 * @group meta
 	 * @ticket 37923
 	 */
-	class Tests_Multisite_Site_Meta extends WP_UnitTestCase {
+	class Tests_Multisite_SiteMeta extends WP_UnitTestCase {
 		protected static $site_id;
 		protected static $site_id2;
 		protected static $flag_was_set;
diff --git a/tests/phpunit/tests/multisite/updateBlogDetails.php b/tests/phpunit/tests/multisite/updateBlogDetails.php
index c3bd0e3cdf..7a983fc7de 100644
--- a/tests/phpunit/tests/multisite/updateBlogDetails.php
+++ b/tests/phpunit/tests/multisite/updateBlogDetails.php
@@ -6,7 +6,7 @@ if ( is_multisite() ) :
 	 * @group ms-site
 	 * @group multisite
 	 */
-	class Tests_Multisite_Update_Blog_Details extends WP_UnitTestCase {
+	class Tests_Multisite_UpdateBlogDetails extends WP_UnitTestCase {
 		/**
 		 * If `update_blog_details()` is called with any kind of empty arguments, it
 		 * should return false.
diff --git a/tests/phpunit/tests/multisite/uploadIsUserOverQuota.php b/tests/phpunit/tests/multisite/uploadIsUserOverQuota.php
index 544e632da4..2de3f6b472 100644
--- a/tests/phpunit/tests/multisite/uploadIsUserOverQuota.php
+++ b/tests/phpunit/tests/multisite/uploadIsUserOverQuota.php
@@ -10,7 +10,7 @@ if ( is_multisite() ) :
 	 *
 	 * @group multisite
 	 */
-	class Tests_Multisite_Upload_Is_User_Over_Quota extends WP_UnitTestCase {
+	class Tests_Multisite_UploadIsUserOverQuota extends WP_UnitTestCase {
 		protected $suppress = false;
 
 		public function set_up() {
diff --git a/tests/phpunit/tests/multisite/wpGetSites.php b/tests/phpunit/tests/multisite/wpGetSites.php
index 163a4714dd..1abcb59515 100644
--- a/tests/phpunit/tests/multisite/wpGetSites.php
+++ b/tests/phpunit/tests/multisite/wpGetSites.php
@@ -7,7 +7,7 @@ if ( is_multisite() ) :
 	 * @group ms-site
 	 * @group multisite
 	 */
-	class Tests_Multisite_WP_Get_Sites extends WP_UnitTestCase {
+	class Tests_Multisite_wpGetSites extends WP_UnitTestCase {
 		protected static $site_ids;
 
 		public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
diff --git a/tests/phpunit/tests/multisite/wpInstallDefaults.php b/tests/phpunit/tests/multisite/wpInstallDefaults.php
index 05371f2159..c48a832a05 100644
--- a/tests/phpunit/tests/multisite/wpInstallDefaults.php
+++ b/tests/phpunit/tests/multisite/wpInstallDefaults.php
@@ -8,7 +8,7 @@ if ( is_multisite() ) :
 	 * @group ms-site
 	 * @group multisite
 	 */
-	class Tests_Multisite_Install_Defaults extends WP_UnitTestCase {
+	class Tests_Multisite_wpInstallDefaults extends WP_UnitTestCase {
 		/**
 		 * @ticket 40036
 		 */
diff --git a/tests/phpunit/tests/multisite/wpMSSitesListTable.php b/tests/phpunit/tests/multisite/wpMsSitesListTable.php
similarity index 98%
rename from tests/phpunit/tests/multisite/wpMSSitesListTable.php
rename to tests/phpunit/tests/multisite/wpMsSitesListTable.php
index 9b26e35a36..a14fcf5dca 100644
--- a/tests/phpunit/tests/multisite/wpMSSitesListTable.php
+++ b/tests/phpunit/tests/multisite/wpMsSitesListTable.php
@@ -6,7 +6,7 @@ if ( is_multisite() ) :
 	 * @group admin
 	 * @group network-admin
 	 */
-	class Tests_WP_MS_Sites_List_Table extends WP_UnitTestCase {
+	class Tests_Multisite_wpMsSitesListTable extends WP_UnitTestCase {
 		protected static $site_ids;
 
 		/**
diff --git a/tests/phpunit/tests/multisite/networkQuery.php b/tests/phpunit/tests/multisite/wpNetworkQuery.php
similarity index 99%
rename from tests/phpunit/tests/multisite/networkQuery.php
rename to tests/phpunit/tests/multisite/wpNetworkQuery.php
index a69bc2210c..978a2471d9 100644
--- a/tests/phpunit/tests/multisite/networkQuery.php
+++ b/tests/phpunit/tests/multisite/wpNetworkQuery.php
@@ -9,7 +9,7 @@ if ( is_multisite() ) :
 	 * @group ms-network-query
 	 * @group multisite
 	 */
-	class Tests_Multisite_Network_Query extends WP_UnitTestCase {
+	class Tests_Multisite_wpNetworkQuery extends WP_UnitTestCase {
 		protected static $network_ids;
 
 		protected $suppress = false;
diff --git a/tests/phpunit/tests/multisite/siteQuery.php b/tests/phpunit/tests/multisite/wpSiteQuery.php
similarity index 99%
rename from tests/phpunit/tests/multisite/siteQuery.php
rename to tests/phpunit/tests/multisite/wpSiteQuery.php
index 1a4108c10d..ccfd6c9cb9 100644
--- a/tests/phpunit/tests/multisite/siteQuery.php
+++ b/tests/phpunit/tests/multisite/wpSiteQuery.php
@@ -8,7 +8,7 @@ if ( is_multisite() ) :
 	 * @group ms-site
 	 * @group multisite
 	 */
-	class Tests_Multisite_Site_Query extends WP_UnitTestCase {
+	class Tests_Multisite_wpSiteQuery extends WP_UnitTestCase {
 		protected static $network_ids;
 		protected static $site_ids;
 
diff --git a/tests/phpunit/tests/multisite/wpmuValidateBlogSignup.php b/tests/phpunit/tests/multisite/wpmuValidateBlogSignup.php
index 576822c12f..fc5c5fe445 100644
--- a/tests/phpunit/tests/multisite/wpmuValidateBlogSignup.php
+++ b/tests/phpunit/tests/multisite/wpmuValidateBlogSignup.php
@@ -5,7 +5,7 @@ if ( is_multisite() ) :
 	/**
 	 * @group multisite
 	 */
-	class Tests_Multisite_WpmuValidateBlogSignup extends WP_UnitTestCase {
+	class Tests_Multisite_wpmuValidateBlogSignup extends WP_UnitTestCase {
 		protected static $super_admin_id;
 
 		protected static $existing_user_login = 'existinguserfoo';
diff --git a/tests/phpunit/tests/multisite/wpmuValidateUserSignup.php b/tests/phpunit/tests/multisite/wpmuValidateUserSignup.php
index 7e0ad2750f..f88ed0ff78 100644
--- a/tests/phpunit/tests/multisite/wpmuValidateUserSignup.php
+++ b/tests/phpunit/tests/multisite/wpmuValidateUserSignup.php
@@ -5,7 +5,7 @@ if ( is_multisite() ) :
 	/**
 	 * @group multisite
 	 */
-	class Tests_Multisite_WpmuValidateUserSignup extends WP_UnitTestCase {
+	class Tests_Multisite_wpmuValidateUserSignup extends WP_UnitTestCase {
 		/**
 		 * @dataProvider data_user_name
 		 */