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/language/lib/Drupal/language/Tests/LanguageUILanguageNegotiationTest.php b/core/modules/language/lib/Drupal/language/Tests/LanguageUILanguageNegotiationTest.php
index 5958ac8..3495548 100644
--- a/core/modules/language/lib/Drupal/language/Tests/LanguageUILanguageNegotiationTest.php
+++ b/core/modules/language/lib/Drupal/language/Tests/LanguageUILanguageNegotiationTest.php
@@ -50,7 +50,6 @@ class LanguageUILanguageNegotiationTest extends WebTestBase {
     // is about the negotiation process which is solely in language module.
     parent::setUp(array('locale', 'language_test', 'block'));
     require_once DRUPAL_ROOT . '/core/includes/language.inc';
-    drupal_load('module', 'locale');
     $admin_user = $this->drupalCreateUser(array('administer languages', 'translate interface', 'access administration pages', 'administer blocks'));
     $this->drupalLogin($admin_user);
   }
diff --git a/core/modules/path/path.test b/core/modules/path/path.test
index c742ad5..968f68a 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', 'language');
 
     // 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..ca7b128 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('language'));
 
     // 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..3e7e982 100644
--- a/core/modules/system/system.test
+++ b/core/modules/system/system.test
@@ -439,29 +439,27 @@ class ModuleDependencyTestCase extends ModuleTestCase {
   }
 
   /**
-   * Attempt to enable translation module without locale enabled.
+   * Attempt to enable translation module without language enabled.
    */
   function testEnableWithoutDependency() {
-    // Attempt to enable content translation without locale enabled.
+    // Attempt to enable content translation without language enabled.
     $edit = array();
     $edit['modules[Core][translation][enable]'] = 'translation';
     $this->drupalPost('admin/modules', $edit, t('Save configuration'));
     $this->assertText(t('Some required modules must be enabled'), t('Dependency required.'));
 
-    $this->assertModules(array('translation', 'locale', 'language'), FALSE);
+    $this->assertModules(array('translation', 'language'), FALSE);
 
     // Assert that the locale tables weren't enabled.
     $this->assertTableCount('language', FALSE);
-    $this->assertTableCount('locale', FALSE);
 
     $this->drupalPost(NULL, NULL, t('Continue'));
     $this->assertText(t('The configuration options have been saved.'), t('Modules status has been updated.'));
 
-    $this->assertModules(array('translation', 'locale'), TRUE);
+    $this->assertModules(array('translation', 'language'), TRUE);
 
     // Assert that the locale tables were enabled.
     $this->assertTableCount('language', TRUE);
-    $this->assertTableCount('locale', TRUE);
   }
 
   /**
@@ -1222,7 +1220,7 @@ class DateTimeFunctionalTest extends WebTestBase {
   }
 
   function setUp() {
-    parent::setUp(array('locale'));
+    parent::setUp(array('language'));
 
     // Create admin user and log in admin user.
     $this->admin_user = $this->drupalCreateUser(array('administer site configuration'));
diff --git a/core/modules/system/tests/common.test b/core/modules/system/tests/common.test
index b50daad..e7f1801 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', 'language');
   }
 
   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 Language and SimpleTest in the test environment.
+    parent::setUp('language', 'simpletest', 'common_test');
 
     // Disable preprocessing
     $config = config('system.performance');
@@ -2376,7 +2376,7 @@ class CommonFormatDateTestCase extends WebTestBase {
   }
 
   function setUp() {
-    parent::setUp('locale');
+    parent::setUp('language');
     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/lib/Drupal/translation/Tests/TranslationTest.php b/core/modules/translation/lib/Drupal/translation/Tests/TranslationTest.php
index 19e7a38..e09c8b0 100644
--- a/core/modules/translation/lib/Drupal/translation/Tests/TranslationTest.php
+++ b/core/modules/translation/lib/Drupal/translation/Tests/TranslationTest.php
@@ -27,7 +27,7 @@ class TranslationTest extends WebTestBase {
   }
 
   function setUp() {
-    parent::setUp('language', 'locale', 'translation', 'translation_test');
+    parent::setUp('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'));
diff --git a/core/modules/translation/translation.info b/core/modules/translation/translation.info
index df1b63e..cc3922f 100644
--- a/core/modules/translation/translation.info
+++ b/core/modules/translation/translation.info
@@ -1,6 +1,6 @@
 name = Content Translation
 description = Allows content to be translated into different languages.
-dependencies[] = locale
+dependencies[] = language
 package = Core
 version = VERSION
 core = 8.x