diff --git a/core/modules/system/tests/modules/taxonomy_test/taxonomy_test.module b/core/modules/system/tests/modules/taxonomy_test/taxonomy_test.module
deleted file mode 100644
index 2c6c00a..0000000
--- a/core/modules/system/tests/modules/taxonomy_test/taxonomy_test.module
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-
-/**
- * @file
- * Test module for Taxonomy hooks and functions not used in core.
- *
- * @see Drupal\taxonomy\Tests\TaxonomyHooksTestCase::testTaxonomyTermHooks()
- */
-
-use Drupal\taxonomy\Plugin\Core\Entity\Term;
-use Drupal\entity\Plugin\Core\Entity\EntityDisplay;
-
-/**
- * Implements hook_taxonomy_term_load().
- */
-function taxonomy_test_taxonomy_term_load(array $terms) {
-  foreach ($terms as $term) {
-    $antonym = taxonomy_test_get_antonym($term->tid);
-    if ($antonym) {
-      $term->antonym = $antonym;
-    }
-  }
-}
-
-/**
- * Implements hook_taxonomy_term_insert().
- */
-function taxonomy_test_taxonomy_term_insert(Term $term) {
-  if (!empty($term->antonym)) {
-    db_insert('taxonomy_term_antonym')
-      ->fields(array(
-        'tid' => $term->tid,
-        'name' => trim($term->antonym)
-      ))
-      ->execute();
-  }
-}
-
-/**
- * Implements hook_taxonomy_term_update().
- */
-function taxonomy_test_taxonomy_term_update(Term $term) {
-  if (!empty($term->antonym)) {
-    db_merge('taxonomy_term_antonym')
-      ->key(array('tid' => $term->tid))
-      ->fields(array(
-        'name' => trim($term->antonym)
-      ))
-      ->execute();
-  }
-}
-
-/**
- * Implements hook_taxonomy_term_delete().
- */
-function taxonomy_test_taxonomy_term_delete(Term $term) {
-  db_delete('taxonomy_term_antonym')
-    ->condition('tid', $term->tid)
-    ->execute();
-}
-
-/**
- * Implements hook_taxonomy_term_view().
- */
-function taxonomy_test_taxonomy_term_view(Term $term, EntityDisplay $display, $view_mode, $langcode) {
-  if ($view_mode == 'full') {
-    $term->content['taxonomy_test_term_view_check'] = array(
-      '#prefix' => '<div>',
-      '#markup' => t('The antonym is %antonym', array('%antonym' => $term->antonym)),
-      '#suffix' => '</div>',
-      '#weight' => 10,
-    );
-  }
-}
-
-/**
- * Implements hook_entity_view().
- */
-function taxonomy_test_entity_view($entity, EntityDisplay $display, $view_mode, $langcode) {
-  if ($entity->entityType() == 'taxonomy_term' && $view_mode == 'full') {
-    $entity->content['taxonomy_test_entity_view_check'] = array(
-      '#prefix' => '<div>',
-      '#markup' => t('The antonym is %antonym', array('%antonym' => $entity->antonym)),
-      '#suffix' => '</div>',
-      '#weight' => 20,
-    );
-  }
-}
-
-/**
- * Implements hook_form_FORM_ID_alter().
- */
-function taxonomy_test_form_taxonomy_term_form_alter(&$form, $form_state, $form_id) {
-  $term = $form_state['controller']->getEntity($form_state);
-  $antonym = taxonomy_test_get_antonym($term->tid);
-  $form['advanced']['antonym'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Antonym'),
-    '#default_value' => !empty($antonym) ? $antonym : '',
-    '#description' => t('Antonym of this term.')
-  );
-}
-
-/**
- * Return the antonym of the given term ID.
- */
-function taxonomy_test_get_antonym($tid) {
-  return db_select('taxonomy_term_antonym', 'ta')
-    ->fields('ta', array('name'))
-    ->condition('tid', $tid)
-    ->execute()
-    ->fetchField();
-}
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/HooksTest.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/HooksTest.php
deleted file mode 100644
index edddd1a..0000000
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/HooksTest.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-/**
- * @file
- * Definition of Drupal\taxonomy\Tests\HooksTest.
- */
-
-namespace Drupal\taxonomy\Tests;
-
-/**
- * Tests for taxonomy hook invocation.
- */
-class HooksTest extends TaxonomyTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('taxonomy_test');
-
-  public static function getInfo() {
-    return array(
-      'name' => 'Taxonomy term hooks',
-      'description' => 'Hooks for taxonomy term load/save/delete.',
-      'group' => 'Taxonomy',
-    );
-  }
-
-  function setUp() {
-    parent::setUp();
-
-    $taxonomy_admin = $this->drupalCreateUser(array('administer taxonomy'));
-    $this->drupalLogin($taxonomy_admin);
-  }
-
-  /**
-   * Test hooks on CRUD of terms.
-   *
-   * Test that hooks are run correctly on creating, editing, viewing,
-   * and deleting a term.
-   *
-   * @see taxonomy_test.module
-   */
-  function testTaxonomyTermHooks() {
-    $vocabulary = $this->createVocabulary();
-
-    // Create a term with one antonym.
-    $edit = array(
-      'name' => $this->randomName(),
-      'antonym' => 'Long',
-    );
-    $this->drupalPost('admin/structure/taxonomy/' . $vocabulary->id() . '/add', $edit, t('Save'));
-    $terms = taxonomy_term_load_multiple_by_name($edit['name']);
-    $term = reset($terms);
-    $this->assertEqual($term->antonym, $edit['antonym'], 'Antonym was loaded into the term object.');
-
-    // Update the term with a different antonym.
-    $edit = array(
-      'name' => $this->randomName(),
-      'antonym' => 'Short',
-    );
-    $this->drupalPost('taxonomy/term/' . $term->tid . '/edit', $edit, t('Save'));
-    taxonomy_terms_static_reset();
-    $term = taxonomy_term_load($term->tid);
-    $this->assertEqual($edit['antonym'], $term->antonym, 'Antonym was successfully edited.');
-
-    // View the term and ensure that hook_taxonomy_term_view() and
-    // hook_entity_view() are invoked.
-    $term = taxonomy_term_load($term->tid);
-    module_load_include('inc', 'taxonomy', 'taxonomy.pages');
-    $term_build = taxonomy_term_page($term);
-    $this->assertFalse(empty($term_build['taxonomy_terms'][$term->tid]['taxonomy_test_term_view_check']), 'hook_taxonomy_term_view() was invoked when viewing the term.');
-    $this->assertFalse(empty($term_build['taxonomy_terms'][$term->tid]['taxonomy_test_entity_view_check']), 'hook_entity_view() was invoked when viewing the term.');
-
-    // Delete the term.
-    taxonomy_term_delete($term->tid);
-    $antonym = db_query('SELECT tid FROM {taxonomy_term_antonym} WHERE tid = :tid', array(':tid' => $term->tid))->fetchField();
-    $this->assertFalse($antonym, 'The antonym were deleted from the database.');
-  }
-}