diff -u b/core/modules/simpletest/tests/src/Unit/TestBaseTest.php b/core/modules/simpletest/tests/src/Unit/TestBaseTest.php
--- b/core/modules/simpletest/tests/src/Unit/TestBaseTest.php
+++ b/core/modules/simpletest/tests/src/Unit/TestBaseTest.php
@@ -10,6 +10,15 @@
 use Drupal\Tests\UnitTestCase;
 
 /**
+ * Tests the random strings validation rules.
+ *
+ * @param string $string
+ *  The string to validate.
+ * @param bool $expected
+ *   The expected result of the validation.
+ *
+ * @see \Drupal\simpletest\TestBase::randomStringValidate().
+ *
  * @coversDefaultClass \Drupal\simpletest\TestBase
  * @group simpletest
  */
@@ -79,15 +88,6 @@
   }
 
   /**
-   * Tests the random strings validation rules.
-   *
-   * @param string $string
-   *   The string to validate.
-   * @param bool $expected
-   *   The expected result of the validation.
-   *
-   * @see \Drupal\simpletest\TestBase::randomStringValidate().
-   *
    * @covers ::randomStringValidate
    * @dataProvider providerRandomStringValidate
    */
reverted:
--- b/core/modules/system/tests/modules/accept_header_routing_test/tests/Unit/AcceptHeaderMatcherTest.php
+++ a/core/modules/system/tests/modules/accept_header_routing_test/tests/Unit/AcceptHeaderMatcherTest.php
@@ -48,7 +48,7 @@
    *
    * @see Drupal\Tests\Core\Routing\AcceptHeaderMatcherTest::testAcceptFiltering()
    */
+  public function acceptFilterProvider() {
-  public function providerAcceptFilter() {
     return [
       // Check that JSON routes get filtered and prioritized correctly.
       ['application/json, text/xml;q=0.9', 'json', 'route_c', 'route_e'],
@@ -71,7 +71,7 @@
    * @param string $excluded_route
    *   The route name that should be filtered out during matching.
    *
+   * @dataProvider acceptFilterProvider
-   * @dataProvider providerAcceptFilter
    */
   public function testAcceptFiltering($accept_header, $format, $included_route, $excluded_route) {
     $collection = $this->fixtures->sampleRouteCollection();
diff -u b/core/tests/Drupal/Tests/Core/Route/RoleAccessCheckTest.php b/core/tests/Drupal/Tests/Core/Route/RoleAccessCheckTest.php
--- b/core/tests/Drupal/Tests/Core/Route/RoleAccessCheckTest.php
+++ b/core/tests/Drupal/Tests/Core/Route/RoleAccessCheckTest.php
@@ -140,7 +140,7 @@
    *   A list of accounts which should not have access to the given path.
    *
    * @see \Drupal\Tests\Core\Route\RouterRoleTest::getTestRouteCollection
-   * @see \Drupal\Tests\Core\Route\RouterRoleTest::providerRoleAccess
+   * @see \Drupal\Tests\Core\Route\RouterRoleTest::roleAccessProvider
    *
    * @dataProvider providerRoleAccess
    */
only in patch2:
unchanged:
--- a/core/modules/migrate/tests/src/Unit/Exception/RequirementsExceptionTest.php
+++ b/core/modules/migrate/tests/src/Unit/Exception/RequirementsExceptionTest.php
@@ -28,7 +28,7 @@ public function testGetRequirements() {
 
   /**
    * @covers ::getRequirementsString
-   * @dataProvider getRequirementsProvider
+   * @dataProvider providerGetRequirements
    */
   public function testGetExceptionString($expected, $message, $requirements) {
     $exception = new RequirementsException($message, $requirements);
@@ -38,7 +38,7 @@ public function testGetExceptionString($expected, $message, $requirements) {
   /**
    * Provides a list of requirements to test.
    */
-  public function getRequirementsProvider() {
+  public function providerGetRequirements() {
     return array(
       array(
         'requirements: random_jackson_pivot.',
only in patch2:
unchanged:
--- a/core/tests/Drupal/Tests/Core/Template/TwigSandboxTest.php
+++ b/core/tests/Drupal/Tests/Core/Template/TwigSandboxTest.php
@@ -43,7 +43,7 @@ protected function setUp() {
   /**
    * Tests that dangerous methods cannot be called in entity objects.
    *
-   * @dataProvider getTwigEntityDangerousMethods
+   * @dataProvider providerTwigEntityDangerousMethods
    * @expectedException \Twig_Sandbox_SecurityError
    */
   public function testEntityDangerousMethods($template) {
@@ -56,7 +56,7 @@ public function testEntityDangerousMethods($template) {
    *
    * @return array
    */
-  public function getTwigEntityDangerousMethods() {
+  public function providerTwigEntityDangerousMethods() {
     return [
       ['{{ entity.delete }}'],
       ['{{ entity.save }}'],