diff --git a/core/modules/image/lib/Drupal/image/Tests/ImageFieldDefaultImagesTest.php b/core/modules/image/lib/Drupal/image/Tests/ImageFieldDefaultImagesTest.php
index 4db47eb..b4545cc 100644
--- a/core/modules/image/lib/Drupal/image/Tests/ImageFieldDefaultImagesTest.php
+++ b/core/modules/image/lib/Drupal/image/Tests/ImageFieldDefaultImagesTest.php
@@ -59,7 +59,7 @@ function testDefaultImages() {
       'field_name' => $field->id(),
       'entity_type' => 'node',
       'bundle' => 'page',
-      'label' => $instance->id(),
+      'label' => $instance->label,
       'required' => $instance->required,
       'settings' => array(
         'default_image' => $default_images['instance2']->fid,
diff --git a/core/modules/link/lib/Drupal/link/Tests/LinkFieldTest.php b/core/modules/link/lib/Drupal/link/Tests/LinkFieldTest.php
index 8849ccd..2c668f2 100644
--- a/core/modules/link/lib/Drupal/link/Tests/LinkFieldTest.php
+++ b/core/modules/link/lib/Drupal/link/Tests/LinkFieldTest.php
@@ -65,10 +65,10 @@ function setUp() {
    * Tests link field URL validation.
    */
   function testURLValidation() {
-    $field_name = $this->field->id();
+    $field_name = drupal_strtolower($this->randomName());
     // Create a field with settings to validate.
     $this->field = entity_create('field_entity', array(
-      'field_name' => drupal_strtolower($this->randomName()),
+      'field_name' => $field_name,
       'type' => 'link',
     ));
     $this->field->save();
@@ -139,10 +139,10 @@ function testURLValidation() {
    * Tests the link title settings of a link field.
    */
   function testLinkTitle() {
-    $field_name = $this->field->id();
+    $field_name = drupal_strtolower($this->randomName());
     // Create a field with settings to validate.
     $this->field = entity_create('field_entity', array(
-      'field_name' => drupal_strtolower($this->randomName()),
+      'field_name' => $field_name,
       'type' => 'link',
     ));
     $this->field->save();
@@ -258,10 +258,10 @@ function testLinkTitle() {
    * Tests the default 'link' formatter.
    */
   function testLinkFormatter() {
-    $field_name = $this->field->id();
+    $field_name = drupal_strtolower($this->randomName());
     // Create a field with settings to validate.
     $this->field = entity_create('field_entity', array(
-      'field_name' => drupal_strtolower($this->randomName()),
+      'field_name' => $field_name,
       'type' => 'link',
       'cardinality' => 2,
     ));
@@ -401,10 +401,10 @@ function testLinkFormatter() {
    * merged, since they involve different configuration and output.
    */
   function testLinkSeparateFormatter() {
-    $field_name = $this->field->id();
+    $field_name = drupal_strtolower($this->randomName());
     // Create a field with settings to validate.
     $this->field = entity_create('field_entity', array(
-      'field_name' => drupal_strtolower($this->randomName()),
+      'field_name' => $field_name,
       'type' => 'link',
       'cardinality' => 2,
     ));