diff --git a/core/modules/simpletest/src/BrowserTestBase.php b/core/modules/simpletest/src/BrowserTestBase.php
index 7a24ef4..6cba2e0 100644
--- a/core/modules/simpletest/src/BrowserTestBase.php
+++ b/core/modules/simpletest/src/BrowserTestBase.php
@@ -29,17 +29,14 @@
 use Symfony\Component\HttpFoundation\Request;
 
 /**
- * Test case for functional Drupal tests.
- *
- * Currently, this class should only be used for contrib module testing. Note
- * that it does not have feature parity with WebTestBase and is notably missing
- * the following features:
+ * Provides a test case for functional Drupal tests.
  *
+ * Note that this class does not yet have feature parity with WebTestBase, so
+ * WebTestBase should be used where possible. In particular, this class does
+ * not yet have the following features:
  * - verbose output - see https://www.drupal.org/node/2469721
  * - ajax form emulation - see https://www.drupal.org/node/2469713
  *
- * Use of this module for tests in core is postponed until 8.1.x.
- *
  * Tests extending BrowserTestBase must exist in the
  * Drupal\Tests\yourmodule\Functional namespace and live in the
  * modules/yourmodule/Tests/Functional directory.
@@ -50,6 +47,8 @@
  * - @preserveGlobalState disabled
  *
  * @ingroup testing
+ *
+ * @see \Drupal\simpletest\WebTestBase
  */
 abstract class BrowserTestBase extends \PHPUnit_Framework_TestCase {