diff --git a/core/modules/locale/lib/Drupal/locale/Tests/LocaleImportFunctionalTest.php b/core/modules/locale/lib/Drupal/locale/Tests/LocaleImportFunctionalTest.php
index 3beee64..ccf36f9 100644
--- a/core/modules/locale/lib/Drupal/locale/Tests/LocaleImportFunctionalTest.php
+++ b/core/modules/locale/lib/Drupal/locale/Tests/LocaleImportFunctionalTest.php
@@ -91,7 +91,7 @@ class LocaleImportFunctionalTest extends WebTestBase {
     // Ensure string wasn't overwritten.
     $search = array(
       'string' => 'Montag',
-      'language' => 'fr',
+      'langcode' => 'fr',
       'translation' => 'translated',
     );
     $this->drupalPost('admin/config/regional/translate/translate', $search, t('Filter'));
@@ -113,7 +113,7 @@ class LocaleImportFunctionalTest extends WebTestBase {
     // Ensure string was overwritten.
     $search = array(
       'string' => 'Montag',
-      'language' => 'fr',
+      'langcode' => 'fr',
       'translation' => 'translated',
     );
     $this->drupalPost('admin/config/regional/translate/translate', $search, t('Filter'));
@@ -149,7 +149,7 @@ class LocaleImportFunctionalTest extends WebTestBase {
     // Ensure string wasn't overwritten.
     $search = array(
       'string' => 'januari',
-      'language' => 'fr',
+      'langcode' => 'fr',
       'translation' => 'translated',
     );
     $this->drupalPost('admin/config/regional/translate/translate', $search, t('Filter'));
@@ -168,7 +168,7 @@ class LocaleImportFunctionalTest extends WebTestBase {
     // Ensure string was overwritten.
     $search = array(
       'string' => 'januari',
-      'language' => 'fr',
+      'langcode' => 'fr',
       'translation' => 'translated',
     );
     $this->drupalPost('admin/config/regional/translate/translate', $search, t('Filter'));
@@ -201,7 +201,7 @@ class LocaleImportFunctionalTest extends WebTestBase {
     // Ensure strings were successfully imported.
     $search = array(
       'string' => 'lundi',
-      'language' => $langcode,
+      'langcode' => $langcode,
       'translation' => 'translated',
     );
     $this->drupalPost('admin/config/regional/translate/translate', $search, t('Filter'));
@@ -241,20 +241,14 @@ class LocaleImportFunctionalTest extends WebTestBase {
       'overwrite_options[not_customized]' => TRUE,
     ));
     $this->assertRaw(t('The translation was successfully imported. There are %number newly created translated strings, %update strings were updated and %delete strings were removed.', array('%number' => 0, '%update' => 0, '%delete' => 1)), t('The translation file was successfully imported.'));
-    // This is the language indicator on the translation search screen for
-    // untranslated strings.
-    $language_indicator = "<em class=\"locale-untranslated\">$langcode</em> ";
     $str = "Operations";
     $search = array(
       'string' => $str,
-      'language' => 'all',
-      'translation' => 'all',
+      'langcode' => $langcode,
+      'translation' => 'untranslated',
     );
     $this->drupalPost('admin/config/regional/translate/translate', $search, t('Filter'));
-    // assertText() seems to remove the input field where $str always could be
-    // found, so this is not a false assert.
-    $this->assertText($str, t('Search found the string.'));
-    $this->assertRaw($language_indicator, t('String is untranslated again.'));
+    $this->assertText($str, t('Search found the string as untranslated.'));
   }
 
   /**
diff --git a/core/modules/locale/locale.pages.inc b/core/modules/locale/locale.pages.inc
index 3240898..42b9452 100644
--- a/core/modules/locale/locale.pages.inc
+++ b/core/modules/locale/locale.pages.inc
@@ -53,7 +53,7 @@ function locale_translate_query() {
       break;
   }
 
-  $sql_query = $sql_query->extend('PagerDefault')->limit(50);
+  $sql_query = $sql_query->extend('Drupal\Core\Database\Query\PagerSelectExtender')->limit(50);
   return $sql_query->execute();
 }