diff --git a/core/modules/simpletest/src/AssertContentTrait.php b/core/modules/simpletest/src/AssertContentTrait.php
index 8bbdb57..6ae8135 100644
--- a/core/modules/simpletest/src/AssertContentTrait.php
+++ b/core/modules/simpletest/src/AssertContentTrait.php
@@ -1315,7 +1315,7 @@ protected function assertNoOption($id, $option, $message = '', $group = 'Browser
    * @return bool
    *   TRUE on pass, FALSE on fail.
    *
-   * @todo $id is unusable. Replace with $name.
+   * @deprecated in Drupal 8.2.0, will be removed before Drupal 9.0.0.
    */
   protected function assertOptionSelected($id, $option, $message = '', $group = 'Browser') {
     $elements = $this->xpath('//select[@id=:id]//option[@value=:option]', array(':id' => $id, ':option' => $option));
@@ -1323,6 +1323,33 @@ protected function assertOptionSelected($id, $option, $message = '', $group = 'B
   }
 
   /**
+   * Asserts that a select option in the current page is checked by using the
+   * select name.
+   *
+   * @param string $name
+   *   Name of select field to assert.
+   * @param string $option
+   *   Option to assert.
+   * @param string $message
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
+   *   variables in the message text, not t(). If left blank, a default message
+   *   will be displayed.
+   * @param string $group
+   *   (optional) The group this message is in, which is displayed in a column
+   *   in test output. Use 'Debug' to indicate this is debugging output. Do not
+   *   translate this string. Defaults to 'Browser'; most tests do not override
+   *   this default.
+   *
+   * @return bool
+   *   TRUE on pass, FALSE on fail.
+   */
+  protected function assertOptionSelectedWithName($name, $option, $message = '', $group = 'Browser') {
+    $elements = $this->xpath('//select[@name=:name]//option[@value=:option]', array(':name' => $name, ':option' => $option));
+    return $this->assertTrue(isset($elements[0]) && !empty($elements[0]['selected']), $message ? $message : SafeMarkup::format('Option @option for field @name is selected.', array('@option' => $option, '@name' => $name)), $group);
+  }
+
+  /**
    * Asserts that a select option in the current page is checked.
    *
    * @param string $drupal_selector