diff --git a/core/modules/field/lib/Drupal/field/Tests/Views/FieldUITest.php b/core/modules/field/lib/Drupal/field/Tests/Views/FieldUITest.php
index 5c9b253..46be374 100644
--- a/core/modules/field/lib/Drupal/field/Tests/Views/FieldUITest.php
+++ b/core/modules/field/lib/Drupal/field/Tests/Views/FieldUITest.php
@@ -50,7 +50,7 @@ public function testHandlerUI() {
     $this->drupalGet($url);
 
     // Tests the available formatter options.
-    $result = $this->xpath('//select[@id=:id]/option', array(':id' => 'edit-options-type'));
+    $result = $this->xpath('//select[@id=:id]/option', array(':id' => 'edit-options-formatter'));
     $options = array_map(function($item) {
       return (string) $item->attributes()->value[0];
     }, $result);
@@ -58,10 +58,10 @@ public function testHandlerUI() {
     sort($options, SORT_STRING);
     $this->assertEqual($options, array('text_default', 'text_plain', 'text_trimmed'), 'The text formatters for a simple text field appear as expected.');
 
-    $this->drupalPost(NULL, array('options[type]' => 'text_trimmed'), t('Apply'));
+    $this->drupalPost(NULL, array('options[formatter]' => 'text_trimmed'), t('Apply'));
 
     $this->drupalGet($url);
-    $this->assertOptionSelected('edit-options-type', 'text_trimmed');
+    $this->assertOptionSelected('edit-options-formatter', 'text_trimmed');
 
     $random_number = rand(100, 400);
     $this->drupalPost(NULL, array('options[settings][trim_length]' => $random_number), t('Apply'));
@@ -72,7 +72,7 @@ public function testHandlerUI() {
     $this->drupalPost('admin/structure/views/view/test_view_fieldapi', array(), t('Save'));
     $view = views_get_view('test_view_fieldapi');
     $view->initHandlers();
-    $this->assertEqual($view->field['field_name_0']->options['type'], 'text_trimmed');
+    $this->assertEqual($view->field['field_name_0']->options['formatter'], 'text_trimmed');
     $this->assertEqual($view->field['field_name_0']->options['settings']['trim_length'], $random_number);
   }
 
diff --git a/core/modules/telephone/lib/Drupal/telephone/Tests/TelephoneFieldTest.php b/core/modules/telephone/lib/Drupal/telephone/Tests/TelephoneFieldTest.php
index 4d09f45..541ba12 100644
--- a/core/modules/telephone/lib/Drupal/telephone/Tests/TelephoneFieldTest.php
+++ b/core/modules/telephone/lib/Drupal/telephone/Tests/TelephoneFieldTest.php
@@ -68,7 +68,7 @@ function testTelephoneField() {
     field_create_instance($instance);
 
     entity_get_display('node', 'article', 'default')
-      ->setComponent('field_telephone', array(
+      ->setComponent('field', 'field_telephone', array(
         'type' => 'telephone_link',
         'weight' => 1,
       ))