diff --git a/tests/phpunit/tests/general/paginateLinks.php b/tests/phpunit/tests/general/paginateLinks.php
index be6ce5b2ea..4b24e17bf0 100644
--- a/tests/phpunit/tests/general/paginateLinks.php
+++ b/tests/phpunit/tests/general/paginateLinks.php
@@ -1,6 +1,6 @@
 <?php
 
-class Tests_Paginate_Links extends WP_UnitTestCase {
+class Tests_General_PaginateLinks extends WP_UnitTestCase {
 
 	private $i18n_count = 0;
 
diff --git a/tests/phpunit/tests/general/wpError.php b/tests/phpunit/tests/general/wpError.php
index 9bf78bdfdd..bb4edd2e79 100644
--- a/tests/phpunit/tests/general/wpError.php
+++ b/tests/phpunit/tests/general/wpError.php
@@ -7,7 +7,7 @@
  *
  * @coversDefaultClass WP_Error
  */
-class Tests_WP_Error extends WP_UnitTestCase {
+class Tests_General_wpError extends WP_UnitTestCase {
 
 	/**
 	 * WP_Error fixture.
diff --git a/tests/phpunit/tests/general/archives.php b/tests/phpunit/tests/general/wpGetArchives.php
similarity index 98%
rename from tests/phpunit/tests/general/archives.php
rename to tests/phpunit/tests/general/wpGetArchives.php
index 88cfbd8311..73814e00b6 100644
--- a/tests/phpunit/tests/general/archives.php
+++ b/tests/phpunit/tests/general/wpGetArchives.php
@@ -3,7 +3,7 @@
 /**
  * @group general
  */
-class Tests_General_Archives extends WP_UnitTestCase {
+class Tests_General_wpGetArchives extends WP_UnitTestCase {
 	function setUp() {
 		parent::setUp();
 
diff --git a/tests/phpunit/tests/general/document-title.php b/tests/phpunit/tests/general/wpGetDocumentTitle.php
similarity index 99%
rename from tests/phpunit/tests/general/document-title.php
rename to tests/phpunit/tests/general/wpGetDocumentTitle.php
index a15f926ea9..f9b0d5b4a9 100644
--- a/tests/phpunit/tests/general/document-title.php
+++ b/tests/phpunit/tests/general/wpGetDocumentTitle.php
@@ -6,7 +6,7 @@
  * @group template
  * @group document-title
  */
-class Tests_General_DocumentTitle extends WP_UnitTestCase {
+class Tests_General_wpGetDocumentTitle extends WP_UnitTestCase {
 
 	public $blog_name;
 	public static $category_id;
diff --git a/tests/phpunit/tests/general/resourceHints.php b/tests/phpunit/tests/general/wpResourceHints.php
similarity index 99%
rename from tests/phpunit/tests/general/resourceHints.php
rename to tests/phpunit/tests/general/wpResourceHints.php
index d3d10cbecb..1e622350fe 100644
--- a/tests/phpunit/tests/general/resourceHints.php
+++ b/tests/phpunit/tests/general/wpResourceHints.php
@@ -4,7 +4,7 @@
  * @group template
  * @ticket 34292
  */
-class Tests_WP_Resource_Hints extends WP_UnitTestCase {
+class Tests_General_wpResourceHints extends WP_UnitTestCase {
 	private $old_wp_scripts;
 	private $old_wp_styles;