diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/ColorTest.php b/core/tests/Drupal/Tests/Core/Utility/Color/ColorTest.php
similarity index 92%
rename from core/modules/system/lib/Drupal/system/Tests/Common/ColorTest.php
rename to core/tests/Drupal/Tests/Core/Utility/Color/ColorTest.php
index 2c32b31..bc9a91e 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Common/ColorTest.php
+++ b/core/tests/Drupal/Tests/Core/Utility/Color/ColorTest.php
@@ -2,18 +2,23 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Common\ColorTest.
+ * Definition of Drupal\Core\Utility\Color\ColorTest.
  */
 
-namespace Drupal\system\Tests\Common;
+namespace Drupal\Tests\Core\Utility\Color\ColorTest;
 
 use Drupal\Core\Utility\Color;
-use Drupal\simpletest\UnitTestBase;
+use Drupal\simpletest\DrupalUnitTestBase;
 
 /**
  * Tests color conversion functions.
+ * 
+ * @group Core_Utility
+ * @group Color
+ * 
+ * @expectedException InvalidArgumentException
  */
-class ColorTest extends UnitTestBase {
+class ColorTest extends DrupalUnitTestBase {
 
   public static function getInfo() {
     return array(