diff --git a/core/modules/entity/tests/entity.test b/core/modules/entity/tests/entity.test
index 1047279..b35fefa 100644
--- a/core/modules/entity/tests/entity.test
+++ b/core/modules/entity/tests/entity.test
@@ -105,7 +105,7 @@ class EntityTranslationTestCase extends WebTestBase {
   }
 
   function setUp() {
-    parent::setUp('entity_test', 'language', 'locale');
+    parent::setUp('entity_test', 'locale');
     // Enable translations for the test entity type.
     variable_set('entity_test_translation', TRUE);
 
diff --git a/core/modules/field/modules/text/text.test b/core/modules/field/modules/text/text.test
index a41e8cd..2c0801a 100644
--- a/core/modules/field/modules/text/text.test
+++ b/core/modules/field/modules/text/text.test
@@ -422,7 +422,7 @@ class TextTranslationTestCase extends WebTestBase {
   }
 
   function setUp() {
-    parent::setUp('locale', 'translation');
+    parent::setUp('translation');
 
     $full_html_format = filter_format_load('full_html');
     $this->format = $full_html_format->format;
diff --git a/core/modules/field/tests/field.test b/core/modules/field/tests/field.test
index ca4de1b..b659c81 100644
--- a/core/modules/field/tests/field.test
+++ b/core/modules/field/tests/field.test
@@ -2704,7 +2704,7 @@ class FieldTranslationsTestCase extends FieldTestCase {
   }
 
   function setUp() {
-    parent::setUp('locale', 'field_test');
+    parent::setUp('translation', 'field_test');
 
     $this->field_name = drupal_strtolower($this->randomName() . '_field_name');
 
diff --git a/core/modules/path/path.test b/core/modules/path/path.test
index c742ad5..44e7091 100644
--- a/core/modules/path/path.test
+++ b/core/modules/path/path.test
@@ -312,7 +312,7 @@ class PathLanguageTestCase extends PathTestCase {
   }
 
   function setUp() {
-    parent::setUp('path', 'locale', 'translation');
+    parent::setUp('path', 'translation');
 
     // Create and login user.
     $this->web_user = $this->drupalCreateUser(array('edit any page content', 'create page content', 'administer url aliases', 'create url aliases', 'administer languages', 'translate content', 'access administration pages'));
@@ -455,7 +455,7 @@ class PathLanguageUITestCase extends PathTestCase {
   }
 
   function setUp() {
-    parent::setUp('path', 'locale');
+    parent::setUp('path', 'translation');
 
     // Create and login user.
     $web_user = $this->drupalCreateUser(array('edit any page content', 'create page content', 'administer url aliases', 'create url aliases', 'administer languages', 'access administration pages'));
diff --git a/core/modules/search/search.test b/core/modules/search/search.test
index 619055c..b8dad3e 100644
--- a/core/modules/search/search.test
+++ b/core/modules/search/search.test
@@ -1963,7 +1963,7 @@ class SearchLanguageTestCase extends SearchWebTestCase {
   }
 
   function setUp() {
-    parent::setUp(array('locale'));
+    parent::setUp(array('translation'));
 
     // Create and login user.
     $test_user = $this->drupalCreateUser(array('access content', 'search content', 'use advanced search', 'administer nodes', 'administer languages', 'access administration pages'));
diff --git a/core/modules/system/system.test b/core/modules/system/system.test
index 40f590e..3fcb4dc 100644
--- a/core/modules/system/system.test
+++ b/core/modules/system/system.test
@@ -1222,7 +1222,7 @@ class DateTimeFunctionalTest extends WebTestBase {
   }
 
   function setUp() {
-    parent::setUp(array('locale'));
+    parent::setUp(array('translation'));
 
     // Create admin user and log in admin user.
     $this->admin_user = $this->drupalCreateUser(array('administer site configuration'));
@@ -2532,8 +2532,7 @@ class SystemAdminTestCase extends WebTestBase {
   }
 
   function setUp() {
-    // testAdminPages() requires Locale module.
-    parent::setUp(array('locale'));
+    parent::setUp(array('translation'));
 
     // Create an administrator with all permissions, as well as a regular user
     // who can only access administration pages and perform some Locale module
diff --git a/core/modules/system/tests/common.test b/core/modules/system/tests/common.test
index b50daad..0c32494 100644
--- a/core/modules/system/tests/common.test
+++ b/core/modules/system/tests/common.test
@@ -868,7 +868,7 @@ class CommonDrupalHTTPRequestTestCase extends WebTestBase {
   }
 
   function setUp() {
-    parent::setUp('system_test', 'locale');
+    parent::setUp('system_test', 'translation');
   }
 
   function testDrupalHTTPRequest() {
@@ -1119,8 +1119,8 @@ class CommonJavaScriptTestCase extends WebTestBase {
   }
 
   function setUp() {
-    // Enable Locale and SimpleTest in the test environment.
-    parent::setUp('locale', 'simpletest', 'common_test');
+    // Enable Translation and SimpleTest in the test environment.
+    parent::setUp('translation', 'simpletest', 'common_test');
 
     // Disable preprocessing
     $config = config('system.performance');
@@ -2376,7 +2376,7 @@ class CommonFormatDateTestCase extends WebTestBase {
   }
 
   function setUp() {
-    parent::setUp('locale');
+    parent::setUp('translation');
     variable_set('configurable_timezones', 1);
     variable_set('date_format_long', 'l, j. F Y - G:i');
     variable_set('date_format_medium', 'j. F Y - G:i');
diff --git a/core/modules/translation/translation.test b/core/modules/translation/translation.test
index 1a0f0a0..1989f9c 100644
--- a/core/modules/translation/translation.test
+++ b/core/modules/translation/translation.test
@@ -25,7 +25,7 @@ class TranslationTestCase extends WebTestBase {
   }
 
   function setUp() {
-    parent::setUp('language', 'locale', 'translation', 'translation_test');
+    parent::setUp('language', 'translation', 'translation_test');
 
     // Setup users.
     $this->admin_user = $this->drupalCreateUser(array('bypass node access', 'administer nodes', 'administer languages', 'administer content types', 'administer blocks', 'access administration pages', 'translate content'));