diff --git a/core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php b/core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php
index ff990c6..96098cd 100644
--- a/core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php
+++ b/core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php
@@ -887,8 +887,7 @@ function field_langcode(EntityInterface $entity) {
    */
   public function getDependencies() {
     // Add the module providing the configured field as a dependency.
-    $field = FieldHelper::fieldInfo()->getField($this->definition['entity_type'], $this->definition['field_name']);
-    return array('module' => array($field->get('module')));
+    return array('entity' => array($this->field_info->getConfigDependencyName()));
   }
 
 
diff --git a/core/modules/views/tests/Drupal/views/Tests/Entity/ViewTest.php b/core/modules/views/tests/Drupal/views/Tests/Entity/ViewTest.php
index 5dd480e..0aae557 100644
--- a/core/modules/views/tests/Drupal/views/Tests/Entity/ViewTest.php
+++ b/core/modules/views/tests/Drupal/views/Tests/Entity/ViewTest.php
@@ -55,43 +55,28 @@ protected function setUp() {
    * Tests calculating dependencies.
    *
    * @covers ::calculateDependencies
+   * @dataProvider calculateDependenciesProvider
    */
-  public function testCalculateDependenciesWithNoDependencies() {
-    $values = array();
+  public function testCalculateDependencies($values, $deps) {
     $view = new TestView($values, 'view');
-    $this->assertEquals(array('module' => array('node', 'views')), $view->calculateDependencies());
+    $this->assertEquals(array('module' => $deps), $view->calculateDependencies());
   }
 
-  /**
-   * Tests calculating dependencies defined on some handlers.
-   *
-   * @covers ::calculateDependencies
-   */
-  public function testCalculateDependenciesOnHandlers() {
-    $values = array();
-    $values['display']['default']['display_options']['fields']['example']['dependencies'] = array();
-    $values['display']['default']['display_options']['fields']['example2']['dependencies']['module'] = array('views', 'field');
-    $values['display']['default']['display_options']['fields']['example3']['dependencies']['module'] = array('views', 'image');
+  public function calculateDependenciesProvider(){
+    $handler['display']['default']['display_options']['fields']['example']['dependencies'] = array();
+    $handler['display']['default']['display_options']['fields']['example2']['dependencies']['module'] = array('views', 'field');
+    $handler['display']['default']['display_options']['fields']['example3']['dependencies']['module'] = array('views', 'image');
 
-    $view = new TestView($values, 'view');
-    $this->assertEquals(array('module' => array('field', 'image', 'node', 'views')), $view->calculateDependencies());
-  }
-
-  /**
-   * Tests calculating dependencies defined on some plugins.
-   *
-   * @covers ::calculateDependencies
-   */
-  public function testCalculateDependenciesOnPlugins() {
-    $values = array();
-    $values['display']['default']['display_options']['access']['options']['dependencies'] = array();
-    $values['display']['default']['display_options']['row']['options']['dependencies']['module'] = array('views', 'field');
-    $values['display']['default']['display_options']['style']['options']['dependencies']['module'] = array('views', 'image');
+    $plugin['display']['default']['display_options']['access']['options']['dependencies'] = array();
+    $plugin['display']['default']['display_options']['row']['options']['dependencies']['module'] = array('views', 'field');
+    $plugin['display']['default']['display_options']['style']['options']['dependencies']['module'] = array('views', 'image');
 
-    $view = new TestView($values, 'view');
-    $this->assertEquals(array('module' => array('field', 'image', 'node', 'views')), $view->calculateDependencies());
+    return array(
+      array(array(), array('node', 'views')),
+      array($handler, array('field', 'image', 'node', 'views')),
+      array($plugin, array('field', 'image', 'node', 'views')),
+    );
   }
-
 }
 
 class TestView extends View {
@@ -110,13 +95,3 @@ protected function drupalGetSchema($table = NULL, $rebuild = FALSE) {
 }
 
 }
-
-namespace {
-
-if (!function_exists('t')) {
-  function t($string) {
-    return $string;
-  }
-}
-
-}