diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockLanguageTest.php b/core/modules/block/lib/Drupal/block/Tests/BlockLanguageTest.php
index 246e92c..2081dd2 100644
--- a/core/modules/block/lib/Drupal/block/Tests/BlockLanguageTest.php
+++ b/core/modules/block/lib/Drupal/block/Tests/BlockLanguageTest.php
@@ -46,7 +46,7 @@ function setUp() {
       'predefined_langcode' => 'fr',
     );
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
-    $this->assertText('French', 'Language added successfully.');
+    $this->assertText('Français', 'Language added successfully.');
   }
 
   /**
diff --git a/core/modules/config_translation/lib/Drupal/config_translation/Tests/ConfigTranslationUiTest.php b/core/modules/config_translation/lib/Drupal/config_translation/Tests/ConfigTranslationUiTest.php
index ed4b1e2..c5308fb 100644
--- a/core/modules/config_translation/lib/Drupal/config_translation/Tests/ConfigTranslationUiTest.php
+++ b/core/modules/config_translation/lib/Drupal/config_translation/Tests/ConfigTranslationUiTest.php
@@ -132,7 +132,7 @@ public function testSiteInformationTranslationUi() {
     );
 
     $this->drupalPostForm("$translation_base_url/fr/add", $edit, t('Save translation'));
-    $this->assertRaw(t('Successfully saved @language translation.', array('@language' => 'French')));
+    $this->assertRaw(t('Successfully saved @language translation.', array('@language' => 'Français')));
 
     // Check for edit, delete links (and no 'add' link) for French language.
     $this->assertNoLinkByHref("$translation_base_url/fr/add");
@@ -199,7 +199,7 @@ public function testSourceValueDuplicateSave() {
       'config_names[system.site][slogan][translation]' => 'FR ' . $site_slogan,
     );
     $this->drupalPostForm(NULL, $edit, t('Save translation'));
-    $this->assertRaw(t('Successfully updated @language translation.', array('@language' => 'French')));
+    $this->assertRaw(t('Successfully updated @language translation.', array('@language' => 'Français')));
     $config_parsed = $file_storage->read($language_config_name);
 
     // Expect only slogan in language specific file.
@@ -551,7 +551,7 @@ public function testViewsTranslationUI() {
       'config_names[views.view.frontpage][display][default][display_options][display.default.display_options.title][translation]' => $display_options_master . " FR",
     );
     $this->drupalPostForm("$translation_base_url/fr/add", $edit, t('Save translation'));
-    $this->assertRaw(t('Successfully saved @language translation.', array('@language' => 'French')));
+    $this->assertRaw(t('Successfully saved @language translation.', array('@language' => 'Français')));
 
     // Check for edit, delete links (and no 'add' link) for French language.
     $this->assertNoLinkByHref("$translation_base_url/fr/add");
@@ -622,7 +622,7 @@ public function testSingleLanguageUI() {
 
     // Delete French language
     $this->drupalPostForm('admin/config/regional/language/delete/fr', array(), t('Delete'));
-    $this->assertRaw(t('The %language (%langcode) language has been removed.', array('%language' => 'French', '%langcode' => 'fr')));
+    $this->assertRaw(t('The %language (%langcode) language has been removed.', array('%language' => 'Français', '%langcode' => 'fr')));
 
     // Change default language to Tamil.
     $edit = array(
diff --git a/core/modules/locale/lib/Drupal/locale/Tests/LocaleExportTest.php b/core/modules/locale/lib/Drupal/locale/Tests/LocaleExportTest.php
index d77fdc2..7b0a0a7 100644
--- a/core/modules/locale/lib/Drupal/locale/Tests/LocaleExportTest.php
+++ b/core/modules/locale/lib/Drupal/locale/Tests/LocaleExportTest.php
@@ -65,7 +65,7 @@ function testExportTranslation() {
     ), t('Export'));
 
     // Ensure we have a translation file.
-    $this->assertRaw('# French translation of Drupal', 'Exported French translation file.');
+    $this->assertRaw('# Français translation of Drupal', 'Exported French translation file.');
     // Ensure our imported translations exist in the file.
     $this->assertRaw('msgstr "lundi"', 'French translations present in exported file.');
 
@@ -95,7 +95,7 @@ function testExportTranslation() {
     ), t('Export'));
 
     // Ensure we have a translation file.
-    $this->assertRaw('# French translation of Drupal', 'Exported French translation file with only customized strings.');
+    $this->assertRaw('# Français translation of Drupal', 'Exported French translation file with only customized strings.');
     // Ensure the customized translations exist in the file.
     $this->assertRaw('msgstr "janvier"', 'French custom translation present in exported file.');
     // Ensure no untranslated strings exist in the file.
@@ -110,7 +110,7 @@ function testExportTranslation() {
     ), t('Export'));
 
     // Ensure we have a translation file.
-    $this->assertRaw('# French translation of Drupal', 'Exported French translation file with only untranslated strings.');
+    $this->assertRaw('# Français translation of Drupal', 'Exported French translation file with only untranslated strings.');
     // Ensure no customized translations exist in the file.
     $this->assertNoRaw('msgstr "janvier"', 'French custom translation not present in exported file.');
     // Ensure the untranslated strings exist in the file, and with right quotes.
diff --git a/core/modules/locale/lib/Drupal/locale/Tests/LocaleImportFunctionalTest.php b/core/modules/locale/lib/Drupal/locale/Tests/LocaleImportFunctionalTest.php
index d822f10..bb12b44 100644
--- a/core/modules/locale/lib/Drupal/locale/Tests/LocaleImportFunctionalTest.php
+++ b/core/modules/locale/lib/Drupal/locale/Tests/LocaleImportFunctionalTest.php
@@ -61,7 +61,7 @@ function testStandalonePoFile() {
     ));
     \Drupal::config('locale.settings');
     // The import should automatically create the corresponding language.
-    $this->assertRaw(t('The language %language has been created.', array('%language' => 'French')), 'The language has been automatically created.');
+    $this->assertRaw(t('The language %language has been created.', array('%language' => 'Français')), 'The language has been automatically created.');
 
     // The import should have created 8 strings.
     $this->assertRaw(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.', array('%number' => 8, '%update' => 0, '%delete' => 0)), 'The translation file was successfully imported.');
diff --git a/core/modules/locale/lib/Drupal/locale/Tests/LocalePluralFormatTest.php b/core/modules/locale/lib/Drupal/locale/Tests/LocalePluralFormatTest.php
index 195453a..fde8aa8 100644
--- a/core/modules/locale/lib/Drupal/locale/Tests/LocalePluralFormatTest.php
+++ b/core/modules/locale/lib/Drupal/locale/Tests/LocalePluralFormatTest.php
@@ -149,7 +149,7 @@ function testPluralEditExport() {
       'langcode' => 'fr',
     ), t('Export'));
     // Ensure we have a translation file.
-    $this->assertRaw('# French translation of Drupal', 'Exported French translation file.');
+    $this->assertRaw('# Français translation of Drupal', 'Exported French translation file.');
     // Ensure our imported translations exist in the file.
     $this->assertRaw("msgid \"Monday\"\nmsgstr \"lundi\"", 'French translations present in exported file.');
     // Check for plural export specifically.
@@ -160,7 +160,7 @@ function testPluralEditExport() {
       'langcode' => 'hr',
     ), t('Export'));
     // Ensure we have a translation file.
-    $this->assertRaw('# Croatian translation of Drupal', 'Exported Croatian translation file.');
+    $this->assertRaw('# Hrvatski translation of Drupal', 'Exported Croatian translation file.');
     // Ensure our imported translations exist in the file.
     $this->assertRaw("msgid \"Monday\"\nmsgstr \"Ponedjeljak\"", 'Croatian translations present in exported file.');
     // Check for plural export specifically.
diff --git a/core/modules/locale/lib/Drupal/locale/Tests/LocaleUpdateInterfaceTest.php b/core/modules/locale/lib/Drupal/locale/Tests/LocaleUpdateInterfaceTest.php
index 0a502b6..dd036b3 100644
--- a/core/modules/locale/lib/Drupal/locale/Tests/LocaleUpdateInterfaceTest.php
+++ b/core/modules/locale/lib/Drupal/locale/Tests/LocaleUpdateInterfaceTest.php
@@ -75,7 +75,7 @@ function testInterface() {
     // Check if updates are available for German.
     $this->drupalGet('admin/reports/status');
     $this->assertText(t('Translation update status'), 'Status message');
-    $this->assertRaw(t('Updates available for: @languages. See the <a href="@updates">Available translation updates</a> page for more information.', array('@languages' => t('German'), '@updates' => url('admin/reports/translations'))), 'Updates available message');
+    $this->assertRaw(t('Updates available for: @languages. See the <a href="@updates">Available translation updates</a> page for more information.', array('@languages' => t('Deutsch'), '@updates' => url('admin/reports/translations'))), 'Updates available message');
     $this->drupalGet('admin/reports/translations');
     $this->assertText(t('Updates for: @modules', array('@modules' => 'Locale test translate')), 'Translations avaiable');
 
@@ -89,7 +89,7 @@ function testInterface() {
     // Check if no updates were found.
     $this->drupalGet('admin/reports/status');
     $this->assertText(t('Translation update status'), 'Status message');
-    $this->assertRaw(t('Missing translations for: @languages. See the <a href="@updates">Available translation updates</a> page for more information.', array('@languages' => t('German'), '@updates' => url('admin/reports/translations'))), 'Missing translations message');
+    $this->assertRaw(t('Missing translations for: @languages. See the <a href="@updates">Available translation updates</a> page for more information.', array('@languages' => t('Deutsch'), '@updates' => url('admin/reports/translations'))), 'Missing translations message');
     $this->drupalGet('admin/reports/translations');
     $this->assertText(t('Missing translations for one project'), 'No translations found');
     $this->assertText(t('@module (@version).', array('@module' => 'Locale test translate', '@version' => '1.3-dev')), 'Release details');
diff --git a/core/modules/locale/lib/Drupal/locale/Tests/LocaleUpdateTest.php b/core/modules/locale/lib/Drupal/locale/Tests/LocaleUpdateTest.php
index 81a1ac6..ef5a770 100644
--- a/core/modules/locale/lib/Drupal/locale/Tests/LocaleUpdateTest.php
+++ b/core/modules/locale/lib/Drupal/locale/Tests/LocaleUpdateTest.php
@@ -145,7 +145,7 @@ function testUpdateImportSourceRemote() {
     $this->drupalGet('admin/reports/translations/check');
 
     // Check the status on the Available translation status page.
-    $this->assertRaw('<label class="visually-hidden" for="edit-langcodes-de">Update German</label>', 'German language found');
+    $this->assertRaw('<label class="visually-hidden" for="edit-langcodes-de">Update Deutsch</label>', 'German language found');
     $this->assertText('Updates for: Contributed module one, Contributed module two, Custom module one, Locale test', 'Updates found');
     $this->assertText('Contributed module one (' . format_date($this->timestamp_now, 'html_date') . ')', 'Updates for Contrib module one');
     $this->assertText('Contributed module two (' . format_date($this->timestamp_new, 'html_date') . ')', 'Updates for Contrib module two');
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeViewLanguageTest.php b/core/modules/node/lib/Drupal/node/Tests/NodeViewLanguageTest.php
index f2bdf7f..aaf38df 100644
--- a/core/modules/node/lib/Drupal/node/Tests/NodeViewLanguageTest.php
+++ b/core/modules/node/lib/Drupal/node/Tests/NodeViewLanguageTest.php
@@ -46,7 +46,7 @@ public function testViewLanguage() {
     $node = $this->drupalCreateNode(array('langcode' => 'es'));
 
     $this->drupalGet($node->getSystemPath());
-    $this->assertText('Spanish','The language field is displayed properly.');
+    $this->assertText('Español','The language field is displayed properly.');
   }
 
 }
diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchLanguageTest.php b/core/modules/search/lib/Drupal/search/Tests/SearchLanguageTest.php
index 0ef0af6..eb36455 100644
--- a/core/modules/search/lib/Drupal/search/Tests/SearchLanguageTest.php
+++ b/core/modules/search/lib/Drupal/search/Tests/SearchLanguageTest.php
@@ -39,13 +39,13 @@ function testLanguages() {
     // Add predefined language.
     $edit = array('predefined_langcode' => 'fr');
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
-    $this->assertText('French', 'Language added successfully.');
+    $this->assertText('Français', 'Language added successfully.');
 
     // Now we should have languages displayed.
     $this->drupalGet('search/node');
     $this->assertText(t('Languages'), 'Languages displayed to choose from.');
     $this->assertText(t('English'), 'English is a possible choice.');
-    $this->assertText(t('French'), 'French is a possible choice.');
+    $this->assertText(t('Français'), 'French is a possible choice.');
 
     // Ensure selecting no language does not make the query different.
     $this->drupalPostForm('search/node', array(), t('Advanced search'));