diff --git a/core/modules/color/src/Tests/ColorConfigSchemaTest.php b/core/modules/color/tests/src/Functional/ColorConfigSchemaTest.php
similarity index 87%
rename from core/modules/color/src/Tests/ColorConfigSchemaTest.php
rename to core/modules/color/tests/src/Functional/ColorConfigSchemaTest.php
index 941e520..157deb8 100644
--- a/core/modules/color/src/Tests/ColorConfigSchemaTest.php
+++ b/core/modules/color/tests/src/Functional/ColorConfigSchemaTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\color\Tests;
+namespace Drupal\Tests\color\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Ensures the color config schema is correct.
  *
  * @group color
  */
-class ColorConfigSchemaTest extends WebTestBase {
+class ColorConfigSchemaTest extends BrowserTestBase {
 
   /**
    * Modules to install.
diff --git a/core/modules/color/src/Tests/ColorSafePreviewTest.php b/core/modules/color/tests/src/Functional/ColorSafePreviewTest.php
similarity index 89%
rename from core/modules/color/src/Tests/ColorSafePreviewTest.php
rename to core/modules/color/tests/src/Functional/ColorSafePreviewTest.php
index 813a92e..e80202f 100644
--- a/core/modules/color/src/Tests/ColorSafePreviewTest.php
+++ b/core/modules/color/tests/src/Functional/ColorSafePreviewTest.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Drupal\color\Tests;
+namespace Drupal\Tests\color\Functional;
 
 use Drupal\Core\Url;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests sanitizing color preview loaded from theme.
  *
- * @group Theme
+ * @group color
  */
-class ColorSafePreviewTest extends WebTestBase {
+class ColorSafePreviewTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/color/src/Tests/ColorTest.php b/core/modules/color/tests/src/Functional/ColorTest.php
similarity index 98%
rename from core/modules/color/src/Tests/ColorTest.php
rename to core/modules/color/tests/src/Functional/ColorTest.php
index 578f7fb..dc44566 100644
--- a/core/modules/color/src/Tests/ColorTest.php
+++ b/core/modules/color/tests/src/Functional/ColorTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\color\Tests;
+namespace Drupal\Tests\color\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Modify the Bartik theme colors and make sure the changes are reflected on the
@@ -10,7 +10,7 @@
  *
  * @group color
  */
-class ColorTest extends WebTestBase {
+class ColorTest extends BrowserTestBase {
 
   /**
    * Modules to install.