diff --git a/tests/phpunit/tests/user/getActiveBlogForUser.php b/tests/phpunit/tests/user/getActiveBlogForUser.php
index 2abb726e2f..423d71927c 100644
--- a/tests/phpunit/tests/user/getActiveBlogForUser.php
+++ b/tests/phpunit/tests/user/getActiveBlogForUser.php
@@ -9,7 +9,7 @@ if ( is_multisite() ) :
 	 * @group ms-user
 	 * @group multisite
 	 */
-	class Tests_Multisite_getActiveBlogForUser extends WP_UnitTestCase {
+	class Tests_User_GetActiveBlogForUser extends WP_UnitTestCase {
 		public static $user_id = false;
 
 		public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
diff --git a/tests/phpunit/tests/user/multisite.php b/tests/phpunit/tests/user/multisite.php
index adccd60442..23079f4799 100644
--- a/tests/phpunit/tests/user/multisite.php
+++ b/tests/phpunit/tests/user/multisite.php
@@ -9,7 +9,7 @@ if ( is_multisite() ) :
 	 * @group ms-user
 	 * @group multisite
 	 */
-	class Tests_Multisite_User extends WP_UnitTestCase {
+	class Tests_User_Multisite extends WP_UnitTestCase {
 
 		public function test_remove_user_from_blog() {
 			$user1 = self::factory()->user->create_and_get();
diff --git a/tests/phpunit/tests/user/wpAuthenticateSpamCheck.php b/tests/phpunit/tests/user/wpAuthenticateSpamCheck.php
index fef983ddcf..81ce98ff1d 100644
--- a/tests/phpunit/tests/user/wpAuthenticateSpamCheck.php
+++ b/tests/phpunit/tests/user/wpAuthenticateSpamCheck.php
@@ -3,7 +3,7 @@
 /**
  * @group user
  */
-class Tests_User_WpAuthenticateSpamCheck extends WP_UnitTestCase {
+class Tests_User_wpAuthenticateSpamCheck extends WP_UnitTestCase {
 
 	/**
 	 * @group ms-excluded
diff --git a/tests/phpunit/tests/user/wpDeleteUser.php b/tests/phpunit/tests/user/wpDeleteUser.php
index a654678174..e37fa43ba6 100644
--- a/tests/phpunit/tests/user/wpDeleteUser.php
+++ b/tests/phpunit/tests/user/wpDeleteUser.php
@@ -3,7 +3,7 @@
 /**
  * @group user
  */
-class Tests_User_WpDeleteUser extends WP_UnitTestCase {
+class Tests_User_wpDeleteUser extends WP_UnitTestCase {
 
 	/**
 	 * Test that usermeta cache is cleared after user deletion.
diff --git a/tests/phpunit/tests/user/wpDropdownUsers.php b/tests/phpunit/tests/user/wpDropdownUsers.php
index 98e9b76df6..2a7bbbffb2 100644
--- a/tests/phpunit/tests/user/wpDropdownUsers.php
+++ b/tests/phpunit/tests/user/wpDropdownUsers.php
@@ -5,7 +5,7 @@
  *
  * @group user
  */
-class Tests_User_WpDropdownUsers extends WP_UnitTestCase {
+class Tests_User_wpDropdownUsers extends WP_UnitTestCase {
 
 	/**
 	 * @ticket 31251
diff --git a/tests/phpunit/tests/user/wpGetUsersWithNoRole.php b/tests/phpunit/tests/user/wpGetUsersWithNoRole.php
index 1165307aed..f853e0e78b 100644
--- a/tests/phpunit/tests/user/wpGetUsersWithNoRole.php
+++ b/tests/phpunit/tests/user/wpGetUsersWithNoRole.php
@@ -3,7 +3,7 @@
 /**
  * @group user
  */
-class Tests_User_GetUsersWithNoRole extends WP_UnitTestCase {
+class Tests_User_wpGetUsersWithNoRole extends WP_UnitTestCase {
 
 	/**
 	 * @ticket 22993
diff --git a/tests/phpunit/tests/user/wpListUsers.php b/tests/phpunit/tests/user/wpListUsers.php
index 32d30699c1..2d76ad16b2 100644
--- a/tests/phpunit/tests/user/wpListUsers.php
+++ b/tests/phpunit/tests/user/wpListUsers.php
@@ -4,7 +4,7 @@
  *
  * @covers ::wp_list_users
  */
-class Tests_Functions_wpListUsers extends WP_UnitTestCase {
+class Tests_User_wpListUsers extends WP_UnitTestCase {
 	private static $user_ids = array();
 
 	public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
diff --git a/tests/phpunit/tests/user/wpSendUserRequest.php b/tests/phpunit/tests/user/wpSendUserRequest.php
index cb0c41fe69..f36304bad4 100644
--- a/tests/phpunit/tests/user/wpSendUserRequest.php
+++ b/tests/phpunit/tests/user/wpSendUserRequest.php
@@ -15,7 +15,7 @@
  * @group user
  * @covers ::wp_send_user_request
  */
-class Tests_User_WpSendUserRequest extends WP_UnitTestCase {
+class Tests_User_wpSendUserRequest extends WP_UnitTestCase {
 
 	/**
 	 * Test administrator user.
diff --git a/tests/phpunit/tests/user/wpSetCurrentUser.php b/tests/phpunit/tests/user/wpSetCurrentUser.php
index b451a5298b..559aa2fbf4 100644
--- a/tests/phpunit/tests/user/wpSetCurrentUser.php
+++ b/tests/phpunit/tests/user/wpSetCurrentUser.php
@@ -3,7 +3,7 @@
 /**
  * @group user
  */
-class Tests_User_WpSetCurrentUser extends WP_UnitTestCase {
+class Tests_User_wpSetCurrentUser extends WP_UnitTestCase {
 	protected static $user_id;
 	protected static $user_id2;
 	protected static $user_ids = array();