diff --git a/tests/phpunit/tests/hooks/addFilter.php b/tests/phpunit/tests/hooks/addFilter.php
index 2c9d773d0d..5890f22044 100644
--- a/tests/phpunit/tests/hooks/addFilter.php
+++ b/tests/phpunit/tests/hooks/addFilter.php
@@ -7,7 +7,7 @@
  * @group hooks
  * @covers WP_Hook::add_filter
  */
-class Tests_WP_Hook_Add_Filter extends WP_UnitTestCase {
+class Tests_Hooks_AddFilter extends WP_UnitTestCase {
 
 	public $hook;
 
diff --git a/tests/phpunit/tests/hooks/applyFilters.php b/tests/phpunit/tests/hooks/applyFilters.php
index 1fecefb81a..fcb8e3b126 100644
--- a/tests/phpunit/tests/hooks/applyFilters.php
+++ b/tests/phpunit/tests/hooks/applyFilters.php
@@ -6,7 +6,7 @@
  * @group hooks
  * @covers WP_Hook::apply_filters
  */
-class Tests_WP_Hook_Apply_Filters extends WP_UnitTestCase {
+class Tests_Hooks_ApplyFilters extends WP_UnitTestCase {
 
 	public function test_apply_filters_with_callback() {
 		$a             = new MockAction();
diff --git a/tests/phpunit/tests/hooks/doAction.php b/tests/phpunit/tests/hooks/doAction.php
index 28a230e47f..b9357ad155 100644
--- a/tests/phpunit/tests/hooks/doAction.php
+++ b/tests/phpunit/tests/hooks/doAction.php
@@ -6,7 +6,7 @@
  * @group hooks
  * @covers WP_Hook::do_action
  */
-class Tests_WP_Hook_Do_Action extends WP_UnitTestCase {
+class Tests_Hooks_DoAction extends WP_UnitTestCase {
 	private $events        = array();
 	private $action_output = '';
 	private $hook;
diff --git a/tests/phpunit/tests/hooks/doAllHook.php b/tests/phpunit/tests/hooks/doAllHook.php
index c15e9a1bc0..29eec96428 100644
--- a/tests/phpunit/tests/hooks/doAllHook.php
+++ b/tests/phpunit/tests/hooks/doAllHook.php
@@ -6,7 +6,7 @@
  * @group hooks
  * @covers WP_Hook::do_all_hook
  */
-class Tests_WP_Hook_Do_All_Hook extends WP_UnitTestCase {
+class Tests_Hooks_DoAllHook extends WP_UnitTestCase {
 
 	public function test_do_all_hook_with_multiple_calls() {
 		$a             = new MockAction();
diff --git a/tests/phpunit/tests/hooks/hasFilter.php b/tests/phpunit/tests/hooks/hasFilter.php
index e335cd1335..f9d48b3d4e 100644
--- a/tests/phpunit/tests/hooks/hasFilter.php
+++ b/tests/phpunit/tests/hooks/hasFilter.php
@@ -6,7 +6,7 @@
  * @group hooks
  * @covers WP_Hook::has_filter
  */
-class Tests_WP_Hook_Has_Filter extends WP_UnitTestCase {
+class Tests_Hooks_HasFilter extends WP_UnitTestCase {
 
 	public function test_has_filter_with_function() {
 		$callback      = '__return_null';
diff --git a/tests/phpunit/tests/hooks/hasFilters.php b/tests/phpunit/tests/hooks/hasFilters.php
index 8601075ec5..f5c1e657fc 100644
--- a/tests/phpunit/tests/hooks/hasFilters.php
+++ b/tests/phpunit/tests/hooks/hasFilters.php
@@ -6,7 +6,7 @@
  * @group hooks
  * @covers WP_Hook::has_filters
  */
-class Tests_WP_Hook_Has_Filters extends WP_UnitTestCase {
+class Tests_Hooks_HasFilters extends WP_UnitTestCase {
 
 	public function test_has_filters_with_callback() {
 		$callback      = '__return_null';
diff --git a/tests/phpunit/tests/hooks/iterator.php b/tests/phpunit/tests/hooks/iterator.php
index 6795f50870..4840aa3d4d 100644
--- a/tests/phpunit/tests/hooks/iterator.php
+++ b/tests/phpunit/tests/hooks/iterator.php
@@ -6,7 +6,7 @@
  * @group hooks
  * @covers WP_Hook::add_filter
  */
-class Tests_WP_Hook_Iterator extends WP_UnitTestCase {
+class Tests_Hooks_Iterator extends WP_UnitTestCase {
 
 	public function test_foreach() {
 		$callback_one  = '__return_null';
diff --git a/tests/phpunit/tests/hooks/preinitHooks.php b/tests/phpunit/tests/hooks/preinitHooks.php
index ce80fe06ce..551d64400f 100644
--- a/tests/phpunit/tests/hooks/preinitHooks.php
+++ b/tests/phpunit/tests/hooks/preinitHooks.php
@@ -6,7 +6,7 @@
  * @group hooks
  * @covers WP_Hook::build_preinitialized_hooks
  */
-class Tests_WP_Hook_Preinit_Hooks extends WP_UnitTestCase {
+class Tests_Hooks_PreinitHooks extends WP_UnitTestCase {
 
 	public function test_array_to_hooks() {
 		$tag1      = __FUNCTION__ . '_1';
diff --git a/tests/phpunit/tests/hooks/removeAllFilters.php b/tests/phpunit/tests/hooks/removeAllFilters.php
index c79baf59cb..cfaf81f4c8 100644
--- a/tests/phpunit/tests/hooks/removeAllFilters.php
+++ b/tests/phpunit/tests/hooks/removeAllFilters.php
@@ -6,7 +6,7 @@
  * @group hooks
  * @covers WP_Hook::remove_all_filters
  */
-class Tests_WP_Hook_Remove_All_Filters extends WP_UnitTestCase {
+class Tests_Hooks_RemoveAllFilters extends WP_UnitTestCase {
 
 	public function test_remove_all_filters() {
 		$callback      = '__return_null';
diff --git a/tests/phpunit/tests/hooks/removeFilter.php b/tests/phpunit/tests/hooks/removeFilter.php
index 2cd4d94141..d1c4eb7106 100644
--- a/tests/phpunit/tests/hooks/removeFilter.php
+++ b/tests/phpunit/tests/hooks/removeFilter.php
@@ -6,7 +6,7 @@
  * @group hooks
  * @covers WP_Hook::remove_filter
  */
-class Tests_WP_Hook_Remove_Filter extends WP_UnitTestCase {
+class Tests_Hooks_RemoveFilter extends WP_UnitTestCase {
 
 	public function test_remove_filter_with_function() {
 		$callback      = '__return_null';