diff --git a/tests/phpunit/CRM/Contribute/Form/TaskTest.php b/tests/phpunit/CRM/Contribute/Form/TaskTest.php
index ed5f6851b2b4..ffecaada62cd 100644
--- a/tests/phpunit/CRM/Contribute/Form/TaskTest.php
+++ b/tests/phpunit/CRM/Contribute/Form/TaskTest.php
@@ -28,7 +28,7 @@
 /**
  * Class CRM_Contribute_Form_Tasktest
  */
-class CRM_Contribute_Form_Tasktest extends CiviUnitTestCase {
+class CRM_Contribute_Form_TaskTest extends CiviUnitTestCase {
   /**
    * Assume empty database with just civicrm_data.
    */
diff --git a/tests/phpunit/CRM/Custom/Page/AjaxTest.php b/tests/phpunit/CRM/Custom/Page/AJAXTest.php
similarity index 100%
rename from tests/phpunit/CRM/Custom/Page/AjaxTest.php
rename to tests/phpunit/CRM/Custom/Page/AJAXTest.php
diff --git a/tests/phpunit/CRM/Event/Form/Registration/RegisterTest.php b/tests/phpunit/CRM/Event/Form/Registration/RegistrationTest.php
similarity index 97%
rename from tests/phpunit/CRM/Event/Form/Registration/RegisterTest.php
rename to tests/phpunit/CRM/Event/Form/Registration/RegistrationTest.php
index 531b23333435..757119cbefca 100644
--- a/tests/phpunit/CRM/Event/Form/Registration/RegisterTest.php
+++ b/tests/phpunit/CRM/Event/Form/Registration/RegistrationTest.php
@@ -29,7 +29,7 @@
  * Class CRM_Event_Form_RegistrationTest
  * @group headless
  */
-class CRM_Event_Form_RegistrationTest extends CiviUnitTestCase {
+class CRM_Event_Form_Registration_RegistrationTest extends CiviUnitTestCase {
 
   public function setUp() {
     parent::setUp();
diff --git a/tests/phpunit/CRM/Import/DataSource/CsvTest.php b/tests/phpunit/CRM/Import/DataSource/CsvTest.php
index ee7b394b0ae0..2f93b6da9b06 100644
--- a/tests/phpunit/CRM/Import/DataSource/CsvTest.php
+++ b/tests/phpunit/CRM/Import/DataSource/CsvTest.php
@@ -28,7 +28,7 @@
 /**
  * Tests for the CRM_Import_Datasource_Csv class.
  */
-class CRM_Import_Datasource_CsvTest extends CiviUnitTestCase {
+class CRM_Import_DataSource_CsvTest extends CiviUnitTestCase {
 
   /**
    * Test the to csv function.
diff --git a/tests/phpunit/api/v3/UserTest.php b/tests/phpunit/api/v3/UserTest.php
index adae2b439ec0..b8caa31fc933 100644
--- a/tests/phpunit/api/v3/UserTest.php
+++ b/tests/phpunit/api/v3/UserTest.php
@@ -26,13 +26,13 @@
  */
 
 /**
- *  Test APIv3 civicrm_website_* functions
+ *  Test APIv3 civicrm_user_* functions
  *
  * @package CiviCRM_APIv3
  * @subpackage API_Contact
  * @group headless
  */
-class api_v3_UserWebsiteTest extends CiviUnitTestCase {
+class api_v3_UserTest extends CiviUnitTestCase {
   protected $_apiversion = 3;
   protected $params;
   protected $_entity = 'User';