diff --git a/core/tests/Drupal/Tests/Component/Image/ImageUtilityTest.php b/core/tests/Drupal/Tests/Component/Utility/ImageTest.php
similarity index 95%
rename from core/tests/Drupal/Tests/Component/Image/ImageUtilityTest.php
rename to core/tests/Drupal/Tests/Component/Utility/ImageTest.php
index e31f8bb..8708d80 100644
--- a/core/tests/Drupal/Tests/Component/Image/ImageUtilityTest.php
+++ b/core/tests/Drupal/Tests/Component/Utility/ImageTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\Component\Image\ImageUtilityTest.
+ * Contains \Drupal\Tests\Component\Utility\ImageTest.
  */
 
-namespace Drupal\Tests\Component\Image;
+namespace Drupal\Tests\Component\Utility;
 
 use Drupal\Component\Utility\Image;
 use Drupal\Tests\UnitTestCase;
@@ -15,7 +15,7 @@
  *
  * @see \Drupal\Component\Utility\Image
  */
-class ImageUtilityTest extends UnitTestCase {
+class ImageTest extends UnitTestCase {
 
   public static function getInfo() {
     return array(
@@ -30,7 +30,7 @@ public static function getInfo() {
    *
    * @dataProvider providerTestScaleDimensions
    */
-  function testScaleDimensions($input, $output) {
+  public function testScaleDimensions($input, $output) {
     // Process the test dataset.
     $return_value = Image::scaleDimensions($input['dimensions'], $input['width'], $input['height'], $input['upscale']);