diff --git a/tests/phpunit/tests/widgets/custom-html-widget.php b/tests/phpunit/tests/widgets/wpWidgetCustomHtml.php
similarity index 99%
rename from tests/phpunit/tests/widgets/custom-html-widget.php
rename to tests/phpunit/tests/widgets/wpWidgetCustomHtml.php
index 597a872e78..741076d1cf 100644
--- a/tests/phpunit/tests/widgets/custom-html-widget.php
+++ b/tests/phpunit/tests/widgets/wpWidgetCustomHtml.php
@@ -11,7 +11,7 @@
  *
  * @group widgets
  */
-class Test_WP_Widget_Custom_HTML extends WP_UnitTestCase {
+class Tests_Widgets_wpWidgetCustomHtml extends WP_UnitTestCase {
 
 	/**
 	 * Args passed to the widget_custom_html_content filter.
diff --git a/tests/phpunit/tests/widgets/media-widget.php b/tests/phpunit/tests/widgets/wpWidgetMedia.php
similarity index 99%
rename from tests/phpunit/tests/widgets/media-widget.php
rename to tests/phpunit/tests/widgets/wpWidgetMedia.php
index ba9b305979..74b3ac8b99 100644
--- a/tests/phpunit/tests/widgets/media-widget.php
+++ b/tests/phpunit/tests/widgets/wpWidgetMedia.php
@@ -7,11 +7,11 @@
  */
 
 /**
- * Class Test_WP_Widget_Media
+ * Test wp-includes/widgets/class-wp-widget-media.php
  *
  * @group widgets
  */
-class Test_WP_Widget_Media extends WP_UnitTestCase {
+class Tests_Widgets_wpWidgetMedia extends WP_UnitTestCase {
 
 	/**
 	 * Clean up global scope.
diff --git a/tests/phpunit/tests/widgets/media-audio-widget.php b/tests/phpunit/tests/widgets/wpWidgetMediaAudio.php
similarity index 98%
rename from tests/phpunit/tests/widgets/media-audio-widget.php
rename to tests/phpunit/tests/widgets/wpWidgetMediaAudio.php
index 7655b00d98..329fa5e0c4 100644
--- a/tests/phpunit/tests/widgets/media-audio-widget.php
+++ b/tests/phpunit/tests/widgets/wpWidgetMediaAudio.php
@@ -7,11 +7,11 @@
  */
 
 /**
- * Test wp-includes/widgets/class-wp-widget-audio.php
+ * Test wp-includes/widgets/class-wp-widget-media-audio.php
  *
  * @group widgets
  */
-class Test_WP_Widget_Media_Audio extends WP_UnitTestCase {
+class Tests_Widgets_wpWidgetMediaAudio extends WP_UnitTestCase {
 
 	/**
 	 * Clean up global scope.
diff --git a/tests/phpunit/tests/widgets/media-gallery-widget.php b/tests/phpunit/tests/widgets/wpWidgetMediaGallery.php
similarity index 97%
rename from tests/phpunit/tests/widgets/media-gallery-widget.php
rename to tests/phpunit/tests/widgets/wpWidgetMediaGallery.php
index 9ad9e2864f..8249de4e02 100644
--- a/tests/phpunit/tests/widgets/media-gallery-widget.php
+++ b/tests/phpunit/tests/widgets/wpWidgetMediaGallery.php
@@ -7,11 +7,11 @@
  */
 
 /**
- * Test wp-includes/widgets/class-wp-widget-gallery.php
+ * Test wp-includes/widgets/class-wp-widget-media-gallery.php
  *
  * @group widgets
  */
-class Test_WP_Widget_Media_Gallery extends WP_UnitTestCase {
+class Tests_Widgets_wpWidgetMediaGallery extends WP_UnitTestCase {
 
 	/**
 	 * Clean up global scope.
diff --git a/tests/phpunit/tests/widgets/media-image-widget.php b/tests/phpunit/tests/widgets/wpWidgetMediaImage.php
similarity index 99%
rename from tests/phpunit/tests/widgets/media-image-widget.php
rename to tests/phpunit/tests/widgets/wpWidgetMediaImage.php
index 60f8bf184a..45b44abb62 100644
--- a/tests/phpunit/tests/widgets/media-image-widget.php
+++ b/tests/phpunit/tests/widgets/wpWidgetMediaImage.php
@@ -7,11 +7,11 @@
  */
 
 /**
- * Test wp-includes/widgets/class-wp-widget-image.php
+ * Test wp-includes/widgets/class-wp-widget-media-image.php
  *
  * @group widgets
  */
-class Test_WP_Widget_Media_Image extends WP_UnitTestCase {
+class Tests_Widgets_wpWidgetMediaImage extends WP_UnitTestCase {
 
 	/**
 	 * Clean up global scope.
diff --git a/tests/phpunit/tests/widgets/media-video-widget.php b/tests/phpunit/tests/widgets/wpWidgetMediaVideo.php
similarity index 98%
rename from tests/phpunit/tests/widgets/media-video-widget.php
rename to tests/phpunit/tests/widgets/wpWidgetMediaVideo.php
index b1e665d061..acb4bbf2ce 100644
--- a/tests/phpunit/tests/widgets/media-video-widget.php
+++ b/tests/phpunit/tests/widgets/wpWidgetMediaVideo.php
@@ -7,11 +7,11 @@
  */
 
 /**
- * Test wp-includes/widgets/class-wp-widget-video.php
+ * Test wp-includes/widgets/class-wp-widget-media-video.php
  *
  * @group widgets
  */
-class Test_WP_Widget_Media_Video extends WP_UnitTestCase {
+class Tests_Widgets_wpWidgetMediaVideo extends WP_UnitTestCase {
 
 	/**
 	 * Clean up global scope.
diff --git a/tests/phpunit/tests/widgets/wpWidgetRss.php b/tests/phpunit/tests/widgets/wpWidgetRss.php
index d1625d4f62..5953f65f4d 100644
--- a/tests/phpunit/tests/widgets/wpWidgetRss.php
+++ b/tests/phpunit/tests/widgets/wpWidgetRss.php
@@ -11,7 +11,7 @@
  *
  * @group widgets
  */
-class Test_Widgets_wpWidgetRss extends WP_UnitTestCase {
+class Tests_Widgets_wpWidgetRss extends WP_UnitTestCase {
 
 	/**
 	 * @ticket 53278
diff --git a/tests/phpunit/tests/widgets/text-widget.php b/tests/phpunit/tests/widgets/wpWidgetText.php
similarity index 99%
rename from tests/phpunit/tests/widgets/text-widget.php
rename to tests/phpunit/tests/widgets/wpWidgetText.php
index f216176463..79147f3a27 100644
--- a/tests/phpunit/tests/widgets/text-widget.php
+++ b/tests/phpunit/tests/widgets/wpWidgetText.php
@@ -11,7 +11,7 @@
  *
  * @group widgets
  */
-class Test_WP_Widget_Text extends WP_UnitTestCase {
+class Tests_Widgets_wpWidgetText extends WP_UnitTestCase {
 	/**
 	 * Args passed to the widget_text filter.
 	 *