diff --git a/core/modules/system/tests/modules/test_page_test/src/Form/TestForm.php b/core/modules/system/tests/modules/test_page_test/src/Form/TestForm.php
index 5f25dd7..24a9bdb 100644
--- a/core/modules/system/tests/modules/test_page_test/src/Form/TestForm.php
+++ b/core/modules/system/tests/modules/test_page_test/src/Form/TestForm.php
@@ -35,6 +35,18 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       '#default_value' => 'Test name',
     ];
 
+    $form['checkbox_enabled'] = [
+      '#type' => 'checkbox',
+      '#title' => 'Checkbox enabled',
+      '#default_value' => TRUE,
+    ];
+
+    $form['checkbox_disabled'] = [
+      '#type' => 'checkbox',
+      '#title' => 'Checkbox disabled',
+      '#default_value' => FALSE,
+    ];
+
     $form['description'] = [
       '#type' => 'textfield',
       '#title' => 'Description',
diff --git a/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php b/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php
index 9931804..84aefa7 100644
--- a/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php
+++ b/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php
@@ -122,6 +122,9 @@ public function testClickLink() {
     $this->assertContains('user/register', $this->getSession()->getCurrentUrl());
   }
 
+  /**
+   * Tests error functionality.
+   */
   public function testError() {
     $this->setExpectedException('\Exception', 'User notice: foo');
     $this->drupalGet('test-error');
@@ -152,9 +155,9 @@ public function testLegacyTextAsserts() {
   }
 
   /**
-   * Tests legacy field asserts.
+   * Tests legacy field asserts which use xpath directly.
    */
-  public function testLegacyFieldAsserts() {
+  public function testLegacyXpathAsserts() {
     $this->drupalGet('test-field-xpath');
     $this->assertFieldsByValue($this->xpath("//h1[@class = 'page-title']"), NULL);
     $this->assertFieldsByValue($this->xpath('//table/tbody/tr[2]/td[1]'), 'one');
@@ -167,7 +170,49 @@ public function testLegacyFieldAsserts() {
 
     $this->assertNoFieldByXPath('//notexisting');
     $this->assertNoFieldByXPath("//input[@id = 'edit-name']", 'wrong value');
+  }
+
+  /**
+   * Tests legacy field asserts using textfields.
+   */
+  public function testLegacyFieldAssertsWithTextfields() {
+    $this->drupalGet('test-field-xpath');
+
+    // *** 1. assertNoField().
+    $this->assertNoField('invalid_name_and_id');
 
+    // Test that the assertion fails correctly when searching by name.
+    try {
+      $this->assertNoField('name');
+      $this->fail('The "name" field was not found based on name.');
+    }
+    catch (ExpectationException $e) {
+      $this->pass('assertNoField correctly failed. The "name" field was found by name.');
+    }
+
+    // Test that the assertion fails correctly when searching by id.
+    try {
+      $this->assertNoField('edit-name');
+      $this->fail('The "name" field was not found based on id.');
+    }
+    catch (ExpectationException $e) {
+      $this->pass('assertNoField correctly failed. The "name" field was found by id.');
+    }
+
+    // *** 2. assertField().
+    $this->assertField('name');
+    $this->assertField('edit-name');
+
+    // Test that the assertion fails correctly if the field does not exist.
+    try {
+      $this->assertField('invalid_name_and_id');
+      $this->fail('The "invalid_name_and_id" field was found.');
+    }
+    catch (ExpectationException $e) {
+      $this->pass('assertField correctly failed. The "invalid_name_and_id" field was not found.');
+    }
+
+    // *** 3. assertNoFieldById().
     $this->assertNoFieldById('name');
     $this->assertNoFieldById('name', 'not the value');
     $this->assertNoFieldById('notexisting');
@@ -191,6 +236,7 @@ public function testLegacyFieldAsserts() {
       $this->pass('The "name" field was found.');
     }
 
+    // *** 4. assertFieldById().
     $this->assertFieldById('edit-name', NULL);
     $this->assertFieldById('edit-name', 'Test name');
     $this->assertFieldById('edit-description', NULL);
@@ -205,15 +251,16 @@ public function testLegacyFieldAsserts() {
       $this->pass('The "edit-name" field with no value was not found.');
     }
 
-    // Test that the assertion fails correctly if NULL is passed in.
+    // Test that the assertion fails correctly if the wrong value is passed in.
     try {
-      $this->assertFieldById('name', NULL);
-      $this->fail('The "name" field was found.');
+      $this->assertFieldById('edit-name', 'not the value');
+      $this->fail('The "name" field was found, using the wrong value.');
     }
-    catch (ExpectationException $e) {
-      $this->pass('The "name" field was not found.');
+    catch (\PHPUnit_Framework_ExpectationFailedException $e) {
+      $this->pass('The "name" field was not found, using the wrong value.');
     }
 
+    // *** 5. assertNoFieldByName().
     $this->assertNoFieldByName('name');
     $this->assertNoFieldByName('name', 'not the value');
     $this->assertNoFieldByName('notexisting');
@@ -237,6 +284,40 @@ public function testLegacyFieldAsserts() {
       $this->pass('The "name" field was found.');
     }
 
+    // *** 6. assertFieldByName().
+    $this->assertFieldByName('name');
+    $this->assertFieldByName('name', NULL);
+    $this->assertFieldByName('name', 'Test name');
+    $this->assertFieldByName('description');
+    $this->assertFieldByName('description', '');
+    $this->assertFieldByName('description', NULL);
+
+    // Test that the assertion fails correctly if given the wrong name.
+    try {
+      $this->assertFieldByName('non-existing-name');
+      $this->fail('The "non-existing-name" field was found.');
+    }
+    catch (ExpectationException $e) {
+      $this->pass('The "non-existing-name" field was not found');
+    }
+
+    // Test that the assertion fails correctly if given the wrong value.
+    try {
+      $this->assertFieldByName('name', 'not the value');
+      $this->fail('The "name" field with incorrect value was found.');
+    }
+    catch (ExpectationException $e) {
+      $this->pass('assertFieldByName correctly failed. The "name" field with incorrect value was not found.');
+    }
+  }
+
+  /**
+   * Tests legacy field asserts on other types of field.
+   */
+  public function testLegacyFieldAssertsWithNonTextfields() {
+    $this->drupalGet('test-field-xpath');
+
+    // Option field type.
     $this->assertOptionByText('options', 'one');
     try {
       $this->assertOptionByText('options', 'four');
@@ -246,6 +327,7 @@ public function testLegacyFieldAsserts() {
       $this->pass($e->getMessage());
     }
 
+    // Button field type.
     $this->assertFieldById('edit-save', NULL);
     // Test that the assertion fails correctly if the field value is passed in
     // rather than the id.
@@ -267,6 +349,62 @@ public function testLegacyFieldAsserts() {
     catch (ExpectationException $e) {
       $this->pass($e->getMessage());
     }
+
+    // Checkbox field type.
+    // Test that checkboxes are found/not found correctly by name, when using
+    // TRUE or FALSE to match their 'checked' state.
+    $this->assertFieldByName('checkbox_enabled', TRUE);
+    $this->assertFieldByName('checkbox_disabled', FALSE);
+    $this->assertNoFieldByName('checkbox_enabled', FALSE);
+    $this->assertNoFieldByName('checkbox_disabled', TRUE);
+
+    // Test that checkboxes are found by name when using NULL to ignore the
+    // 'checked' state.
+    $this->assertFieldByName('checkbox_enabled', NULL);
+    $this->assertFieldByName('checkbox_disabled', NULL);
+
+    // Test that checkboxes are found/not found correctly by ID, when using
+    // TRUE or FALSE to match their 'checked' state.
+    $this->assertFieldById('edit-checkbox-enabled', TRUE);
+    $this->assertFieldById('edit-checkbox-disabled', FALSE);
+    $this->assertNoFieldById('edit-checkbox-enabled', FALSE);
+    $this->assertNoFieldById('edit-checkbox-disabled', TRUE);
+
+    // Test that checkboxes are found by by ID, when using NULL to ignore the
+    // 'checked' state.
+    $this->assertFieldById('edit-checkbox-enabled', NULL);
+    $this->assertFieldById('edit-checkbox-disabled', NULL);
+
+    // Test that the assertion fails correctly when using NULL to ignore state.
+    try {
+      $this->assertNoFieldByName('checkbox_enabled', NULL);
+      $this->fail('The "checkbox_enabled" field was not found by name, using NULL value.');
+    }
+    catch (ExpectationException $e) {
+      $this->pass('assertNoFieldByName failed correctly. The "checkbox_enabled" field was found using NULL value.');
+    }
+
+    // Test that the assertion fails correctly when using NULL to ignore state.
+    try {
+      $this->assertNoFieldById('edit-checkbox-disabled', NULL);
+      $this->fail('The "edit-checkbox-disabled" field was not found by ID, using NULL value.');
+    }
+    catch (ExpectationException $e) {
+      $this->pass('assertNoFieldById failed correctly. The "edit-checkbox-disabled" field was found by ID using NULL value.');
+    }
+
+    // Test the specific 'checked' assertions.
+    $this->assertFieldChecked('edit-checkbox-enabled');
+    $this->assertNoFieldChecked('edit-checkbox-disabled');
+
+    // Test that the assertion fails correctly with non-existant field id.
+    try {
+      $this->assertNoFieldChecked('incorrect_checkbox_id');
+      $this->fail('The "incorrect_checkbox_id" field was found');
+    }
+    catch (ExpectationException $e) {
+      $this->pass('assertNoFieldChecked correctly failed. The ""wrong_checkbox_id"" field was not found.');
+    }
   }
 
   /**