diff --git a/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapTest.php b/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapTest.php
index 3460ca3..caa62a5 100644
--- a/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapTest.php
+++ b/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapTest.php
@@ -352,7 +352,7 @@ public function testGetRowBySource() {
    * - Single-value source ID to multi-value destination ID.
    * - Multi-value source ID to single-value destination ID.
    */
-  public function lookupDestinationIdMappingDataProvider() {
+  public function providerLookupDestinationIdMappingData() {
     return [
       [1, 1],
       [2, 2],
@@ -368,7 +368,7 @@ public function lookupDestinationIdMappingDataProvider() {
    *   Number of source fields to test.
    * @param int $num_destination_fields
    *   Number of destination fields to test.
-   * @dataProvider lookupDestinationIdMappingDataProvider
+   * @dataProvider providerLookupDestinationIdMappingData
    */
   public function testLookupDestinationIdMapping($num_source_fields, $num_destination_fields) {
     // Adjust the migration configuration according to the number of source and
@@ -436,7 +436,7 @@ public function testGetRowByDestination() {
    * - Single-value destination ID to multi-value source ID.
    * - Multi-value destination ID to single-value source ID.
    */
-  public function lookupSourceIDMappingDataProvider() {
+  public function providerLookupSourceIDMappingData() {
     return [
       [1, 1],
       [2, 2],
@@ -452,7 +452,7 @@ public function lookupSourceIDMappingDataProvider() {
    *   Number of source fields to test.
    * @param int $num_destination_fields
    *   Number of destination fields to test.
-   * @dataProvider lookupSourceIDMappingDataProvider
+   * @dataProvider providerLookupSourceIDMappingData
    */
   public function testLookupSourceIDMapping($num_source_fields, $num_destination_fields) {
     // Adjust the migration configuration according to the number of source and
@@ -557,7 +557,7 @@ public function testProcessedCount() {
    * - One update.
    * - Multiple updates.
    */
-  public function updateCountDataProvider() {
+  public function providerUpdateCountData() {
     return [
       [0],
       [1],
@@ -570,7 +570,7 @@ public function updateCountDataProvider() {
    *
    * @param int $num_update_rows
    *   The number of update rows to test.
-   * @dataProvider updateCountDataProvider
+   * @dataProvider providerUpdateCountData
    */
   public function testUpdateCount($num_update_rows) {
     for ($i = 0; $i < 5; $i++) {
@@ -599,7 +599,7 @@ public function testUpdateCount($num_update_rows) {
    * - One error.
    * - Multiple errors.
    */
-  public function errorCountDataProvider() {
+  public function providerErrorCountData() {
     return [
       [0],
       [1],
@@ -612,7 +612,7 @@ public function errorCountDataProvider() {
    *
    * @param int $num_error_rows
    *   Number of error rows to test.
-   * @dataProvider errorCountDataProvider
+   * @dataProvider providerErrorCountData
    */
   public function testErrorCount($num_error_rows) {
     for ($i = 0; $i < 5; $i++) {
diff --git a/core/modules/node/src/Tests/Migrate/d7/MigrateNodeTypeTest.php b/core/modules/node/src/Tests/Migrate/d7/MigrateNodeTypeTest.php
index c3706a9..4ac5e11 100644
--- a/core/modules/node/src/Tests/Migrate/d7/MigrateNodeTypeTest.php
+++ b/core/modules/node/src/Tests/Migrate/d7/MigrateNodeTypeTest.php
@@ -39,7 +39,6 @@ protected function setUp() {
   /**
    * Tests a single node type.
    *
-   * @dataProvider testNodeTypeDataProvider
    * @param string $id
    *  The node type ID.
    * @param string $label
diff --git a/core/tests/Drupal/Tests/Component/DependencyInjection/ContainerTest.php b/core/tests/Drupal/Tests/Component/DependencyInjection/ContainerTest.php
index 21f6f5f..27174df 100644
--- a/core/tests/Drupal/Tests/Component/DependencyInjection/ContainerTest.php
+++ b/core/tests/Drupal/Tests/Component/DependencyInjection/ContainerTest.php
@@ -663,7 +663,7 @@ public function testInitializedForAliases() {
    *
    * @expectedException \BadMethodCallException
    *
-   * @dataProvider scopeExceptionTestProvider
+   * @dataProvider providerScopeExceptionTest
    */
   public function testScopeFunctionsWithException($method, $argument) {
     $callable = array(
@@ -675,14 +675,14 @@ public function testScopeFunctionsWithException($method, $argument) {
   }
 
   /**
-   * Data provider for scopeExceptionTestProvider().
+   * Data provider for testScopeFunctionsWithException().
    *
    * @return array[]
    *   Returns per data set an array with:
    *     - method name to call
    *     - argument to pass
    */
-  public function scopeExceptionTestProvider() {
+  public function providerScopeExceptionTest() {
     $scope = $this->prophesize('\Symfony\Component\DependencyInjection\ScopeInterface')->reveal();
     return array(
       array('enterScope', 'test_scope'),
diff --git a/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php b/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php
index ca9a2e4..6cb7472 100644
--- a/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php
+++ b/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php
@@ -96,7 +96,7 @@ public function testDumpForEmptyContainer() {
      *
      * @covers ::getAliases
      *
-     * @dataProvider getAliasesDataProvider
+     * @dataProvider providerGetAliasesData
      */
     public function testGetAliases($aliases, $definition_aliases) {
       $this->containerDefinition['aliases'] = $definition_aliases;
@@ -112,7 +112,7 @@ public function testGetAliases($aliases, $definition_aliases) {
      *     - aliases as returned by ContainerBuilder.
      *     - aliases as expected in the container definition.
      */
-    public function getAliasesDataProvider() {
+    public function providerGetAliasesData() {
       return array(
         array(array(), array()),
         array(
@@ -135,7 +135,7 @@ public function getAliasesDataProvider() {
      * @covers ::dumpValue
      * @covers ::getReferenceCall
      *
-     * @dataProvider getParametersDataProvider
+     * @dataProvider providerGetParametersData
      */
     public function testGetParameters($parameters, $definition_parameters, $is_frozen) {
       $this->containerDefinition['parameters'] = $definition_parameters;
@@ -162,7 +162,7 @@ public function testGetParameters($parameters, $definition_parameters, $is_froze
      *     - parameters as expected in the container definition.
      *     - frozen value
      */
-    public function getParametersDataProvider() {
+    public function providerGetParametersData() {
       return array(
         array(array(), array(), TRUE),
         array(
@@ -207,7 +207,7 @@ public function getParametersDataProvider() {
      * @covers ::getServiceCall
      * @covers ::getParameterCall
      *
-     * @dataProvider getDefinitionsDataProvider
+     * @dataProvider providerGetDefinitionsData
      */
     public function testGetServiceDefinitions($services, $definition_services) {
       $this->containerDefinition['services'] = $definition_services;
@@ -234,7 +234,7 @@ public function testGetServiceDefinitions($services, $definition_services) {
      *     - parameters as expected in the container definition.
      *     - frozen value
      */
-    public function getDefinitionsDataProvider() {
+    public function providerGetDefinitionsData() {
       $base_service_definition = array(
         'class' => '\stdClass',
         'public' => TRUE,
diff --git a/core/tests/Drupal/Tests/Core/Cache/Context/CacheContextsManagerTest.php b/core/tests/Drupal/Tests/Core/Cache/Context/CacheContextsManagerTest.php
index db8d7b7..c9968b8 100644
--- a/core/tests/Drupal/Tests/Core/Cache/Context/CacheContextsManagerTest.php
+++ b/core/tests/Drupal/Tests/Core/Cache/Context/CacheContextsManagerTest.php
@@ -176,7 +176,7 @@ protected function getMockContainer() {
    *
    * @return array
    */
-  public function validateTokensProvider() {
+  public function providerValidateTokens() {
     return [
       [[], FALSE],
       [['foo'], FALSE],
@@ -206,7 +206,7 @@ public function validateTokensProvider() {
   /**
    * @covers ::validateTokens
    *
-   * @dataProvider validateTokensProvider
+   * @dataProvider providerValidateTokens
    */
   public function testValidateContexts(array $contexts, $expected_exception_message) {
     $container = new ContainerBuilder();
diff --git a/core/tests/Drupal/Tests/Core/Form/FormElementHelperTest.php b/core/tests/Drupal/Tests/Core/Form/FormElementHelperTest.php
index d25a6f5..83883b0 100644
--- a/core/tests/Drupal/Tests/Core/Form/FormElementHelperTest.php
+++ b/core/tests/Drupal/Tests/Core/Form/FormElementHelperTest.php
@@ -25,7 +25,7 @@ class FormElementHelperTest extends UnitTestCase {
    *
    * @covers ::getElementByName
    *
-   * @dataProvider getElementByNameProvider
+   * @dataProvider providerGetElementByName
    */
   public function testGetElementByName($name, $form, $expected) {
     $this->assertSame($expected, FormElementHelper::getElementByName($name, $form));
@@ -34,7 +34,7 @@ public function testGetElementByName($name, $form, $expected) {
   /**
    * Provides test data.
    */
-  public function getElementByNameProvider() {
+  public function providerGetElementByName() {
     $data = [];
     $data[] = ['id', [], []];
     $data[] = [
@@ -110,7 +110,7 @@ public function getElementByNameProvider() {
    *
    * @covers ::getElementTitle
    *
-   * @dataProvider getElementTitleProvider
+   * @dataProvider providerGetElementTitle
    */
   public function testGetElementTitle($name, $form, $expected) {
     $element = FormElementHelper::getElementByName($name, $form);
@@ -120,7 +120,7 @@ public function testGetElementTitle($name, $form, $expected) {
   /**
    * Provides test data.
    */
-  public function getElementTitleProvider() {
+  public function providerGetElementTitle() {
     $data = [];
     $data[] = ['id', [], ''];
     $data[] = [