diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/ImportOpmlTest.php b/core/modules/aggregator/lib/Drupal/aggregator/Tests/ImportOpmlTest.php
index ffdc6ce..fb97e3b 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Tests/ImportOpmlTest.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Tests/ImportOpmlTest.php
@@ -45,7 +45,7 @@ function openImportForm() {
     $this->assertText('A single OPML document may contain a collection of many feeds.', 'Found OPML help text.');
     $this->assertField('files[upload]', 'Found file upload field.');
     $this->assertField('remote', 'Found Remote URL field.');
-    $this->assertField('refresh', '', 'Found Refresh field.');
+    $this->assertFieldByName('refresh', '', 'Found Refresh field.');
   }
 
   /**
diff --git a/core/modules/language/lib/Drupal/language/Tests/LanguageBrowserDetectionUnitTest.php b/core/modules/language/lib/Drupal/language/Tests/LanguageBrowserDetectionUnitTest.php
index 679d6f9..9c7d847 100644
--- a/core/modules/language/lib/Drupal/language/Tests/LanguageBrowserDetectionUnitTest.php
+++ b/core/modules/language/lib/Drupal/language/Tests/LanguageBrowserDetectionUnitTest.php
@@ -175,8 +175,8 @@ function testUIBrowserLanguageMappings() {
 
     // Check that defaults are loaded from language.mappings.yml.
     $this->drupalGet('admin/config/regional/language/detection/browser');
-    $this->assertField('edit-mappings-zh-cn-browser-langcode', 'zh-cn', 'Chinese browser language code found.');
-    $this->assertField('edit-mappings-zh-cn-drupal-langcode', 'zh-hans-cn', 'Chinese Drupal language code found.');
+    $this->assertFieldById('edit-mappings-zh-cn-browser-langcode', 'zh-cn', 'Chinese browser language code found.');
+    $this->assertFieldById('edit-mappings-zh-cn-drupal-langcode', 'zh-hans-cn', 'Chinese Drupal language code found.');
 
     // Delete zh-cn language code.
     $browser_langcode = 'zh-cn';
@@ -200,8 +200,8 @@ function testUIBrowserLanguageMappings() {
     );
     $this->drupalPostForm('admin/config/regional/language/detection/browser', $edit, t('Save configuration'));
     $this->drupalGet('admin/config/regional/language/detection/browser');
-    $this->assertField('edit-mappings-xx-browser-langcode', 'xx', 'Browser language code found.');
-    $this->assertField('edit-mappings-xx-drupal-langcode', 'en', 'Drupal language code found.');
+    $this->assertFieldById('edit-mappings-xx-browser-langcode', 'xx', 'Browser language code found.');
+    $this->assertFieldById('edit-mappings-xx-drupal-langcode', 'en', 'Drupal language code found.');
 
     // Add the same custom mapping again.
     $this->drupalPostForm('admin/config/regional/language/detection/browser', $edit, t('Save configuration'));
@@ -222,7 +222,7 @@ function testUIBrowserLanguageMappings() {
     );
     $this->drupalPostForm('admin/config/regional/language/detection/browser', $edit, t('Save configuration'));
     $this->drupalGet('admin/config/regional/language/detection/browser');
-    $this->assertField('edit-mappings-xx-browser-langcode', 'xx', 'Browser language code found.');
-    $this->assertField('edit-mappings-xx-drupal-langcode', 'zh-hans', 'Drupal language code found.');
+    $this->assertFieldById('edit-mappings-xx-browser-langcode', 'xx', 'Browser language code found.');
+    $this->assertFieldById('edit-mappings-xx-drupal-langcode', 'zh-hans', 'Drupal language code found.');
   }
 }
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/ValidationTest.php b/core/modules/system/lib/Drupal/system/Tests/Form/ValidationTest.php
index bda5872..962e402 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Form/ValidationTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Form/ValidationTest.php
@@ -58,12 +58,12 @@ function testValidate() {
       'name' => 'element_validate_access',
     );
     $this->drupalPostForm(NULL, $edit, 'Save');
-    $this->assertNoFieldByName('name', 'Form element was hidden.');
+    $this->assertNoField('name', 'Form element was hidden.');
     $this->assertText('Name value: element_validate_access', 'Value for inaccessible form element exists.');
 
     // Verify that value for inaccessible form element persists.
     $this->drupalPostForm(NULL, array(), 'Save');
-    $this->assertNoFieldByName('name', 'Form element was hidden.');
+    $this->assertNoField('name', 'Form element was hidden.');
     $this->assertText('Name value: element_validate_access', 'Value for inaccessible form element exists.');
 
     // Verify that #validate handlers don't run if the CSRF token is invalid.
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserLanguageCreationTest.php b/core/modules/user/lib/Drupal/user/Tests/UserLanguageCreationTest.php
index dbf80e4..c63ce93 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserLanguageCreationTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserLanguageCreationTest.php
@@ -75,7 +75,7 @@ function testLocalUserCreation() {
     $this->drupalLogout();
 
     $this->drupalGet($langcode . '/user/register');
-    $this->assertNoFieldByName('language[fr]', 'Language selector is not accessible.');
+    $this->assertNoField('language[fr]', 'Language selector is not accessible.');
 
     $username = $this->randomName(10);
     $edit = array(