diff --git a/core/modules/forum/forum.module b/core/modules/forum/forum.module
index b334c42..3fc9dd2 100644
--- a/core/modules/forum/forum.module
+++ b/core/modules/forum/forum.module
@@ -575,24 +575,32 @@ function forum_field_storage_pre_update($entity_type, $entity, &$skip_fields) {
 }
 
 /**
- * Implements hook_form_alter().
+ * Implements hook_form_FORM_ID_alter().
+ *
+ * @see taxonomy_form_vocabulary()
  */
-function forum_form_alter(&$form, $form_state, $form_id) {
+function forum_form_taxonomy_form_vocabulary_alter(&$form, &$form_state, $form_id) {
+  $vid = variable_get('forum_nav_vocabulary', 0);
+  if (isset($form['vid']['#value']) && $form['vid']['#value'] == $vid) {
+    $form['help_forum_vocab'] = array(
+      '#markup' => t('This is the designated forum vocabulary. Some of the normal vocabulary options have been removed.'),
+      '#weight' => -1,
+    );
+    // Forum's vocabulary always has single hierarchy. Forums and containers has
+    // only one parent or no parent for root items. By default this value is 0.
+    $form['hierarchy']['#value'] = TAXONOMY_HIERARCHY_SINGLE;
+    // Do not allow to delete forum's vocabulary.
+    $form['actions']['delete']['#access'] = FALSE;
+  }
+}
+/**
+ * Implements hook_form_FORM_ID_alter().
+ */
+function forum_form_taxonomy_form_term_alter(&$form, &$form_state, $form_id) {
   $vid = variable_get('forum_nav_vocabulary', 0);
   if (isset($form['vid']['#value']) && $form['vid']['#value'] == $vid) {
-    // Hide critical options from forum vocabulary.
-    if ($form_id == 'taxonomy_form_vocabulary') {
-      $form['help_forum_vocab'] = array(
-        '#markup' => t('This is the designated forum vocabulary. Some of the normal vocabulary options have been removed.'),
-        '#weight' => -1,
-      );
-      $form['hierarchy'] = array('#type' => 'value', '#value' => 1);
-      $form['delete']['#access'] = FALSE;
-    }
     // Hide multiple parents select from forum terms.
-    elseif ($form_id == 'taxonomy_form_term') {
-      $form['advanced']['parent']['#access'] = FALSE;
-    }
+    $form['relations']['parent']['#access'] = FALSE;
   }
 }
 
diff --git a/core/modules/forum/forum.test b/core/modules/forum/forum.test
index c7c3d9c..5b172fc 100644
--- a/core/modules/forum/forum.test
+++ b/core/modules/forum/forum.test
@@ -246,6 +246,27 @@ class ForumTestCase extends DrupalWebTestCase {
     $this->deleteForum($this->delete_forum['tid']);
     // Create forum at the top (root) level.
     $this->root_forum = $this->createForum('forum');
+
+    // Test vocabulary form alterations.
+    $this->drupalGet('admin/structure/taxonomy/forums/edit');
+    $this->assertFieldByName('op', t('Save'), t('Save button found.'));
+    $this->assertNoFieldByName('op', t('Delete'), t('Delete button not found.'));
+    // Test tags vocabulary form is not affected.
+    $this->drupalGet('admin/structure/taxonomy/tags/edit');
+    $this->assertFieldByName('op', t('Save'), t('Save button found.'));
+    $this->assertFieldByName('op', t('Delete'), t('Delete button found.'));
+
+    // Test term edit form alterations.
+    $this->drupalGet('taxonomy/term/' . $this->container['tid'] . '/edit');
+    // Test parent field been hidden by forum module.
+    $this->assertNoField('parent[]', t('Parent field not found.'));
+    // Test tags vocabulary term form is not affected.
+    $this->drupalGet('admin/structure/taxonomy/tags/add');
+    $this->assertField('parent[]', t('Parent field found.'));
+    // Test relations fieldset by element ID to make sure that name is not
+    // 'advanced' as Drupal 6 has.
+    $relations_fieldset = $this->xpath("//fieldset[@id='edit-relations']");
+    $this->assertTrue(isset($relations_fieldset[0]), t('Relations fieldset element found.'));
   }
 
   /**