diff --git a/tests/title.test b/tests/title.test
index 61fa2a3..a0358a0 100644
--- a/tests/title.test
+++ b/tests/title.test
@@ -146,6 +146,23 @@ class TitleFieldReplacementTestCase extends DrupalWebTestCase {
       }
     }
   }
+}
+
+/**
+ * Tests for legacy field replacement.
+ */
+class TitleAdminSettingsTestCase extends DrupalWebTestCase {
+  public static function getInfo() {
+    return array(
+      'name' => 'Admin settings',
+      'description' => 'Test the administration settings.',
+      'group' => 'Title',
+    );
+  }
+
+  function setUp() {
+    parent::setUp('field_test', 'title', 'title_test');
+  }
 
   /**
    * Check for automated title_field attachment.
@@ -155,21 +172,23 @@ class TitleFieldReplacementTestCase extends DrupalWebTestCase {
     $this->drupalLogin($admin_user);
 
     $edit = array(
-      "title_taxonomy_term[auto_attach][name]" => TRUE,
-      "title_taxonomy_term[auto_attach][description]" => TRUE,
+      'title_taxonomy_term[auto_attach][name]' => TRUE,
+      'title_taxonomy_term[auto_attach][description]' => TRUE,
     );
     $this->drupalPost('admin/config/content/title', $edit, t('Save configuration'));
 
     $edit = array(
-      'name' => 'Foo',
-      'machine_name' => 'foo',
-      'description' => 'Bar',
+      'name' => $this->randomName(),
+      'machine_name' => drupal_strtolower($this->randomName()),
+      'description' => $this->randomString(16),
     );
-
     $this->drupalPost('admin/structure/taxonomy/add', $edit, t('Save'));
 
-    $this->assertText('The field name_field was attached automatically to taxonomy term - foo.');
-    $this->assertText('The field description_field was attached automatically to taxonomy term - foo.');
+    $entity_type = 'taxonomy_term';
+    $bundle = $edit['machine_name'];
+    field_info_cache_clear();
+    $this->assertTrue(title_field_replacement_enabled($entity_type, $bundle, 'name'), 'Name field automatically attached.');
+    $this->assertTrue(title_field_replacement_enabled($entity_type, $bundle, 'description', 'Description field automatically attached.'));
   }
 }
 
@@ -189,7 +208,7 @@ class TitleTranslationTestCase extends DrupalWebTestCase {
     parent::setUp('locale', 'entity_translation', 'title');
 
     // Create a power user.
-    $admin_user = $this->drupalCreateUser(array('administer modules',  'view the administration theme', 'administer languages', 'administer taxonomy', 'administer entity translation', 'translate taxonomy_term entities', 'edit original values'));
+    $admin_user = $this->drupalCreateUser(array('administer modules',  'view the administration theme', 'administer languages', 'administer taxonomy', 'administer entity translation', 'translate any entity'));
     $this->drupalLogin($admin_user);
 
     // Enable a translation language.
diff --git a/tests/title_test.info b/tests/title_test.info
index 1cbd097..367e48c 100644
--- a/tests/title_test.info
+++ b/tests/title_test.info
@@ -4,4 +4,6 @@ core = 7.x
 package = Testing
 hidden = TRUE
 dependencies[] = title
+dependencies[] = entity
+dependencies[] = entity_translation
 files[] = title_test.module
diff --git a/tests/title_test.module b/tests/title_test.module
index 24ce4e7..d13bc3a 100644
--- a/tests/title_test.module
+++ b/tests/title_test.module
@@ -28,7 +28,6 @@ function title_test_entity_info() {
   );
 
   $info['test_entity'] = array(
-    'label' => t('Test entity'),
     'entity keys' => array(
       'label' => 'ftlabel',
     ),