diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermTranslationUITest.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermTranslationUITest.php
index eab8050..20db007 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermTranslationUITest.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermTranslationUITest.php
@@ -51,7 +51,7 @@ protected function setupBundle() {
     parent::setupBundle();
 
     // Create a vocabulary.
-    $vocabulary = entity_create('taxonomy_vocabulary', array(
+    $this->vocabulary = entity_create('taxonomy_vocabulary', array(
       'name' => $this->bundle,
       'description' => $this->randomName(),
       'vid' => $this->bundle,
@@ -59,7 +59,7 @@ protected function setupBundle() {
       'help' => '',
       'weight' => mt_rand(0, 10),
     ));
-    $vocabulary->save();
+    $this->vocabulary->save();
   }
 
   /**
@@ -70,18 +70,6 @@ function getTranslatorPermissions() {
   }
 
   /**
-   * Overrides \Drupal\translation_entity\Tests\EntityTranslationUITest::createEntity().
-   */
-  protected function createEntity($values, $langcode, $vocabulary_name = NULL) {
-    if (!isset($vocabulary_name)) {
-      $vocabulary_name = $this->bundle;
-    }
-    $vocabulary = entity_load('taxonomy_vocabulary', $vocabulary_name);
-    $values['vid'] = $vocabulary->id();
-    return parent::createEntity($values, $langcode);
-  }
-
-  /**
    * Overrides \Drupal\translation_entity\Tests\EntityTranslationUITest::getNewEntityValues().
    */
   protected function getNewEntityValues($langcode) {
@@ -110,30 +98,28 @@ function testTranslateLinkVocabularyAdminPage() {
     $this->admin_user = $this->drupalCreateUser(array('access administration pages', 'administer taxonomy', 'translate any entity'));
     $this->drupalLogin($this->admin_user);
 
-    $translatable_vocabulary_name = taxonomy_vocabulary_machine_name_load($this->bundle)->name;
-    $translatable_tid = $this->createEntity(array(), $this->langcodes[0]);
+    $translatable_tid = $this->createEntity(array(), $this->langcodes[0], $this->vocabulary->id());
 
     // Create an untranslatable vocabulary.
     $untranslatable_vocabulary = entity_create('taxonomy_vocabulary', array(
       'name' => 'untranslatable_voc',
       'description' => $this->randomName(),
-      'machine_name' => 'untranslatable_voc',
+      'vid' => 'untranslatable_voc',
       'langcode' => LANGUAGE_NOT_SPECIFIED,
       'help' => '',
       'weight' => mt_rand(0, 10),
     ));
-    taxonomy_vocabulary_save($untranslatable_vocabulary);
+    $untranslatable_vocabulary->save();
 
-    $untranslatable_vocabulary_name = $untranslatable_vocabulary->name;
-    $untranslatable_tid = $this->createEntity(array(), $this->langcodes[0], $untranslatable_vocabulary_name);
+    $untranslatable_tid = $this->createEntity(array(), $this->langcodes[0], $untranslatable_vocabulary->id());
 
     // Verify translation links.
-    $this->drupalGet('admin/structure/taxonomy/' . $translatable_vocabulary_name);
+    $this->drupalGet('admin/structure/taxonomy/' .  $this->vocabulary->id());
     $this->assertResponse(200);
     $this->assertLinkByHref('term/' . $translatable_tid . '/translations');
     $this->assertLinkByHref('term/' . $translatable_tid . '/edit');
 
-    $this->drupalGet('admin/structure/taxonomy/' . $untranslatable_vocabulary_name);
+    $this->drupalGet('admin/structure/taxonomy/' . $untranslatable_vocabulary->id());
     $this->assertResponse(200);
     $this->assertLinkByHref('term/' . $untranslatable_tid . '/edit');
     $this->assertNoLinkByHref('term/' . $untranslatable_tid . '/translations');
diff --git a/core/modules/translation_entity/lib/Drupal/translation_entity/Tests/EntityTranslationUITest.php b/core/modules/translation_entity/lib/Drupal/translation_entity/Tests/EntityTranslationUITest.php
index 934ed62..7f263a9 100644
--- a/core/modules/translation_entity/lib/Drupal/translation_entity/Tests/EntityTranslationUITest.php
+++ b/core/modules/translation_entity/lib/Drupal/translation_entity/Tests/EntityTranslationUITest.php
@@ -231,16 +231,18 @@ function testTranslationUI() {
    *   An array of initial values for the entity.
    * @param string $langcode
    *   The initial language code of the entity.
+   * @param string $bundle_name
+   *   (optional) Entity bundle if entity has bundles. Default to $this->bundle.
    *
    * @return
    *   The entity id.
    */
-  protected function createEntity($values, $langcode) {
+  protected function createEntity($values, $langcode, $bundle_name = NULL) {
     $entity_values = $values;
     $entity_values['langcode'] = $langcode;
     $info = entity_get_info($this->entityType);
     if (!empty($info['entity_keys']['bundle'])) {
-      $entity_values[$info['entity_keys']['bundle']] = $this->bundle;
+      $entity_values[$info['entity_keys']['bundle']] = isset($bundle_name) ? $bundle_name : $this->bundle;
     }
     $controller = entity_get_controller($this->entityType);
     if (!($controller instanceof DatabaseStorageControllerNG)) {