diff --git a/core/modules/field/lib/Drupal/field/Tests/TranslationTest.php b/core/modules/field/lib/Drupal/field/Tests/TranslationTest.php
index 3ec9880..2aefd0f 100644
--- a/core/modules/field/lib/Drupal/field/Tests/TranslationTest.php
+++ b/core/modules/field/lib/Drupal/field/Tests/TranslationTest.php
@@ -80,10 +80,7 @@ public static function getInfo() {
   function setUp() {
     parent::setUp();
 
-    // The prefix is only 6 charachter length, because the field name will get
-    // a suffix such as "_untranslatable". And it will be reach the maximum
-    // field name length.
-    $this->field_name = drupal_strtolower($this->randomName(6) . '_field_name');
+    $this->field_name = drupal_strtolower($this->randomName());
 
     $this->entity_type = 'entity_test';
 
@@ -118,14 +115,6 @@ function setUp() {
    * Ensures that only valid values are returned by field_available_languages().
    */
   function testFieldAvailableLanguages() {
-    // Test 'translatable' fieldable info.
-    field_test_entity_info_translatable('entity_test', FALSE);
-    $field = clone($this->field);
-    $field->name .= '_untranslatable';
-    $field->translatable = FALSE;
-    $field->enforceIsNew();
-    $field->save();
-
     // Enable field translations for the entity.
     field_test_entity_info_translatable('entity_test', TRUE);
 
@@ -142,6 +131,11 @@ function testFieldAvailableLanguages() {
     $this->assertFalse(in_array('en', $available_langcodes), format_string('%language was made unavailable.', array('%language' => 'en')));
 
     // Test field_available_languages() behavior for untranslatable fields.
+    $field_definition = $this->field_definition;
+    $field_definition['name'] .= '_untranslatable';
+    $field_definition['translatable'] = FALSE;
+    $field = entity_create('field_entity', $field_definition);
+    $field->save();
     $available_langcodes = field_available_languages($field->entity_type, $field);
     $this->assertTrue(count($available_langcodes) == 1 && $available_langcodes[0] === Language::LANGCODE_NOT_SPECIFIED, 'For untranslatable fields only Language::LANGCODE_NOT_SPECIFIED is available.');
   }
@@ -152,7 +146,7 @@ function testFieldAvailableLanguages() {
   function testTranslatableFieldSaveLoad() {
     // Enable field translations for nodes.
     field_test_entity_info_translatable('node', TRUE);
-    $entity_info = \Drupal::entityManager()->getDefinition('node');
+    $entity_info = entity_get_info('node');
     $this->assertTrue(count($entity_info['translatable']), 'Nodes are translatable.');
 
     // Prepare the field translations.
@@ -260,7 +254,7 @@ function testFieldDisplayLanguage() {
     $enabled_langcodes = field_content_languages();
     $entity = entity_create($entity_type, array('id' => 1, 'revision_id' => 1, 'type' => $this->instance->bundle));;
     $entity->langcode->value = reset($enabled_langcodes);
-    $instances = \Drupal\field\Field::fieldInfo()->getBundleInstances($entity_type, $bundle);
+    $instances = field_info_instances($entity_type, $bundle);
 
     $langcodes = array();
     // This array is used to store, for each field name, which one of the locked