diff --git a/tests/phpunit/tests/term.php b/tests/phpunit/tests/term.php
index 5f1e9aa621..b6fe99488c 100644
--- a/tests/phpunit/tests/term.php
+++ b/tests/phpunit/tests/term.php
@@ -53,235 +53,6 @@ class Tests_Term extends WP_UnitTestCase {
 		$this->assertEquals( $initial_count, wp_count_terms($this->taxonomy) );
 	}
 
-	public function test_term_exists_term_0() {
-		$this->assertSame( 0, term_exists( 0 ) );
-	}
-
-	public function test_term_exists_term_int_taxonomy_nonempty_term_exists() {
-		$t = $this->factory->term->create( array(
-			'taxonomy' => 'post_tag',
-		) );
-
-		$found = term_exists( intval( $t ), 'post_tag' );
-		$this->assertEquals( $t, $found['term_id'] );
-	}
-
-	public function test_term_exists_term_int_taxonomy_nonempty_term_does_not_exist() {
-		$this->assertNull( term_exists( 54321, 'post_tag' ) );
-	}
-
-	public function test_term_exists_term_int_taxonomy_nonempty_wrong_taxonomy() {
-		$t = $this->factory->term->create( array(
-			'taxonomy' => 'post_tag',
-		) );
-
-		$this->assertNull( term_exists( intval( $t ), 'foo' ) );
-	}
-
-	public function test_term_exists_term_int_taxonomy_empty_term_exists() {
-		$t = $this->factory->term->create( array(
-			'taxonomy' => 'post_tag',
-		) );
-
-		$found = term_exists( intval( $t ), 'post_tag' );
-		$this->assertEquals( $t, $found['term_id'] );
-	}
-
-	public function test_term_exists_term_int_taxonomy_empty_term_does_not_exist() {
-		$this->assertNull( term_exists( 54321 ) );
-	}
-
-	public function test_term_exists_unslash_term() {
-		$t = $this->factory->term->create( array(
-			'taxonomy' => 'post_tag',
-			'name' => 'I "love" WordPress\'s taxonomy system',
-		) );
-
-		$found = term_exists( 'I \"love\" WordPress\\\'s taxonomy system' );
-		$this->assertEquals( $t, $found );
-	}
-
-	public function test_term_exists_trim_term() {
-		$t = $this->factory->term->create( array(
-			'taxonomy' => 'post_tag',
-			'slug' => 'foo',
-		) );
-
-		$found = term_exists( '  foo  ' );
-		$this->assertEquals( $t, $found );
-	}
-
-	public function test_term_exists_term_trimmed_to_empty_string() {
-		$this->assertNull( term_exists( '   ' ) );
-	}
-
-	/**
-	 * @ticket 29589
-	 */
-	public function test_term_exists_existing_term_that_sanitizes_to_empty() {
-		wp_insert_term( '//', 'category' );
-		$this->assertNotEmpty( term_exists( '//' ) );
-		$this->assertNotEmpty( term_exists( '//', 'category' ) );
-
-		wp_insert_term( '>>', 'category' );
-		$this->assertNotEmpty( term_exists( '>>' ) );
-		$this->assertNotEmpty( term_exists( '>>', 'category' ) );
-	}
-
-	public function test_term_exists_taxonomy_nonempty_parent_nonempty_match_slug() {
-		register_taxonomy( 'foo', 'post', array(
-			'hierarchical' => true,
-		) );
-
-		$parent_term = $this->factory->term->create( array(
-			'taxonomy' => 'foo',
-		) );
-
-		$t = $this->factory->term->create( array(
-			'taxonomy' => 'foo',
-			'parent' => $parent_term,
-			'slug' => 'child-term',
-		) );
-
-		$found = term_exists( 'child-term', 'foo', $parent_term );
-
-		_unregister_taxonomy( 'foo' );
-
-		$this->assertInternalType( 'array', $found );
-		$this->assertEquals( $t, $found['term_id'] );
-	}
-
-	/**
-	 * @ticket 29851
-	 */
-	public function test_term_exists_taxonomy_nonempty_parent_0_should_return_false_for_child_term() {
-		register_taxonomy( 'foo', 'post', array(
-			'hierarchical' => true,
-		) );
-
-		$parent_term = $this->factory->term->create( array(
-			'taxonomy' => 'foo',
-		) );
-
-		$t = $this->factory->term->create( array(
-			'taxonomy' => 'foo',
-			'parent' => $parent_term,
-			'slug' => 'child-term',
-		) );
-
-		$found = term_exists( 'child-term', 'foo', 0 );
-
-		_unregister_taxonomy( 'foo' );
-
-		$this->assertSame( null, $found['term_id'] );
-	}
-
-	public function test_term_exists_taxonomy_nonempty_parent_nonempty_match_name() {
-		register_taxonomy( 'foo', 'post', array(
-			'hierarchical' => true,
-		) );
-
-		$parent_term = $this->factory->term->create( array(
-			'taxonomy' => 'foo',
-		) );
-
-		$t = $this->factory->term->create( array(
-			'taxonomy' => 'foo',
-			'parent' => $parent_term,
-			'name' => 'Child Term',
-		) );
-
-		$found = term_exists( 'Child Term', 'foo', $parent_term );
-
-		_unregister_taxonomy( 'foo' );
-
-		$this->assertInternalType( 'array', $found );
-		$this->assertEquals( $t, $found['term_id'] );
-	}
-
-	public function test_term_exists_taxonomy_nonempty_parent_empty_match_slug() {
-		register_taxonomy( 'foo', 'post', array() );
-
-		$t = $this->factory->term->create( array(
-			'taxonomy' => 'foo',
-			'slug' => 'kewl-dudez',
-		) );
-
-		$found = term_exists( 'kewl-dudez', 'foo' );
-
-		_unregister_taxonomy( 'foo' );
-
-		$this->assertInternalType( 'array', $found );
-		$this->assertEquals( $t, $found['term_id'] );
-	}
-
-	public function test_term_exists_taxonomy_nonempty_parent_empty_match_name() {
-		register_taxonomy( 'foo', 'post', array() );
-
-		$t = $this->factory->term->create( array(
-			'taxonomy' => 'foo',
-			'name' => 'Kewl Dudez',
-		) );
-
-		$found = term_exists( 'Kewl Dudez', 'foo' );
-
-		_unregister_taxonomy( 'foo' );
-
-		$this->assertInternalType( 'array', $found );
-		$this->assertEquals( $t, $found['term_id'] );
-	}
-
-	public function test_term_exists_taxonomy_empty_parent_empty_match_slug() {
-		register_taxonomy( 'foo', 'post', array() );
-
-		$t = $this->factory->term->create( array(
-			'taxonomy' => 'foo',
-			'name' => 'juicy-fruit',
-		) );
-
-		$found = term_exists( 'juicy-fruit' );
-
-		_unregister_taxonomy( 'foo' );
-
-		$this->assertInternalType( 'string', $found );
-		$this->assertEquals( $t, $found );
-	}
-
-	public function test_term_exists_taxonomy_empty_parent_empty_match_name() {
-		register_taxonomy( 'foo', 'post', array() );
-
-		$t = $this->factory->term->create( array(
-			'taxonomy' => 'foo',
-			'name' => 'Juicy Fruit',
-		) );
-
-		$found = term_exists( 'Juicy Fruit' );
-
-		_unregister_taxonomy( 'foo' );
-
-		$this->assertInternalType( 'string', $found );
-		$this->assertEquals( $t, $found );
-	}
-
-	function test_term_exists_known() {
-		// insert a term
-		$term = rand_str();
-		$t = wp_insert_term( $term, $this->taxonomy );
-		$this->assertInternalType( 'array', $t );
-		$this->assertEquals( $t['term_id'], term_exists($t['term_id']) );
-		$this->assertEquals( $t['term_id'], term_exists($term) );
-
-		// clean up
-		$this->assertTrue( wp_delete_term($t['term_id'], $this->taxonomy) );
-	}
-
-	function test_term_exists_unknown() {
-		$this->assertNull( term_exists(rand_str()) );
-		$this->assertEquals( 0, term_exists(0) );
-		$this->assertEquals( 0, term_exists('') );
-		$this->assertEquals( 0, term_exists(NULL) );
-	}
-
 	public function test_wp_insert_term_taxonomy_does_not_exist() {
 		$found = wp_insert_term( 'foo', 'bar' );
 
diff --git a/tests/phpunit/tests/term/termExists.php b/tests/phpunit/tests/term/termExists.php
new file mode 100644
index 0000000000..89d9e44ea9
--- /dev/null
+++ b/tests/phpunit/tests/term/termExists.php
@@ -0,0 +1,238 @@
+<?php
+
+/**
+ * @group taxonomy
+ */
+class Tests_TermExists extends WP_UnitTestCase {
+	public function test_term_exists_term_0() {
+		$this->assertSame( 0, term_exists( 0 ) );
+	}
+
+	public function test_term_exists_term_int_taxonomy_nonempty_term_exists() {
+		$t = $this->factory->term->create( array(
+			'taxonomy' => 'post_tag',
+		) );
+
+		$found = term_exists( intval( $t ), 'post_tag' );
+		$this->assertEquals( $t, $found['term_id'] );
+	}
+
+	public function test_term_exists_term_int_taxonomy_nonempty_term_does_not_exist() {
+		$this->assertNull( term_exists( 54321, 'post_tag' ) );
+	}
+
+	public function test_term_exists_term_int_taxonomy_nonempty_wrong_taxonomy() {
+		$t = $this->factory->term->create( array(
+			'taxonomy' => 'post_tag',
+		) );
+
+		$this->assertNull( term_exists( intval( $t ), 'foo' ) );
+	}
+
+	public function test_term_exists_term_int_taxonomy_empty_term_exists() {
+		$t = $this->factory->term->create( array(
+			'taxonomy' => 'post_tag',
+		) );
+
+		$found = term_exists( intval( $t ), 'post_tag' );
+		$this->assertEquals( $t, $found['term_id'] );
+	}
+
+	public function test_term_exists_term_int_taxonomy_empty_term_does_not_exist() {
+		$this->assertNull( term_exists( 54321 ) );
+	}
+
+	public function test_term_exists_unslash_term() {
+		$t = $this->factory->term->create( array(
+			'taxonomy' => 'post_tag',
+			'name' => 'I "love" WordPress\'s taxonomy system',
+		) );
+
+		$found = term_exists( 'I \"love\" WordPress\\\'s taxonomy system' );
+		$this->assertEquals( $t, $found );
+	}
+
+	public function test_term_exists_trim_term() {
+		$t = $this->factory->term->create( array(
+			'taxonomy' => 'post_tag',
+			'slug' => 'foo',
+		) );
+
+		$found = term_exists( '  foo  ' );
+		$this->assertEquals( $t, $found );
+	}
+
+	public function test_term_exists_term_trimmed_to_empty_string() {
+		$this->assertNull( term_exists( '   ' ) );
+	}
+
+	/**
+	 * @ticket 29589
+	 */
+	public function test_term_exists_existing_term_that_sanitizes_to_empty() {
+		wp_insert_term( '//', 'category' );
+		$this->assertNotEmpty( term_exists( '//' ) );
+		$this->assertNotEmpty( term_exists( '//', 'category' ) );
+
+		wp_insert_term( '&gt;&gt;', 'category' );
+		$this->assertNotEmpty( term_exists( '&gt;&gt;' ) );
+		$this->assertNotEmpty( term_exists( '&gt;&gt;', 'category' ) );
+	}
+
+	public function test_term_exists_taxonomy_nonempty_parent_nonempty_match_slug() {
+		register_taxonomy( 'foo', 'post', array(
+			'hierarchical' => true,
+		) );
+
+		$parent_term = $this->factory->term->create( array(
+			'taxonomy' => 'foo',
+		) );
+
+		$t = $this->factory->term->create( array(
+			'taxonomy' => 'foo',
+			'parent' => $parent_term,
+			'slug' => 'child-term',
+		) );
+
+		$found = term_exists( 'child-term', 'foo', $parent_term );
+
+		_unregister_taxonomy( 'foo' );
+
+		$this->assertInternalType( 'array', $found );
+		$this->assertEquals( $t, $found['term_id'] );
+	}
+
+	/**
+	 * @ticket 29851
+	 */
+	public function test_term_exists_taxonomy_nonempty_parent_0_should_return_false_for_child_term() {
+		register_taxonomy( 'foo', 'post', array(
+			'hierarchical' => true,
+		) );
+
+		$parent_term = $this->factory->term->create( array(
+			'taxonomy' => 'foo',
+		) );
+
+		$t = $this->factory->term->create( array(
+			'taxonomy' => 'foo',
+			'parent' => $parent_term,
+			'slug' => 'child-term',
+		) );
+
+		$found = term_exists( 'child-term', 'foo', 0 );
+
+		_unregister_taxonomy( 'foo' );
+
+		$this->assertSame( null, $found['term_id'] );
+	}
+
+	public function test_term_exists_taxonomy_nonempty_parent_nonempty_match_name() {
+		register_taxonomy( 'foo', 'post', array(
+			'hierarchical' => true,
+		) );
+
+		$parent_term = $this->factory->term->create( array(
+			'taxonomy' => 'foo',
+		) );
+
+		$t = $this->factory->term->create( array(
+			'taxonomy' => 'foo',
+			'parent' => $parent_term,
+			'name' => 'Child Term',
+		) );
+
+		$found = term_exists( 'Child Term', 'foo', $parent_term );
+
+		_unregister_taxonomy( 'foo' );
+
+		$this->assertInternalType( 'array', $found );
+		$this->assertEquals( $t, $found['term_id'] );
+	}
+
+	public function test_term_exists_taxonomy_nonempty_parent_empty_match_slug() {
+		register_taxonomy( 'foo', 'post', array() );
+
+		$t = $this->factory->term->create( array(
+			'taxonomy' => 'foo',
+			'slug' => 'kewl-dudez',
+		) );
+
+		$found = term_exists( 'kewl-dudez', 'foo' );
+
+		_unregister_taxonomy( 'foo' );
+
+		$this->assertInternalType( 'array', $found );
+		$this->assertEquals( $t, $found['term_id'] );
+	}
+
+	public function test_term_exists_taxonomy_nonempty_parent_empty_match_name() {
+		register_taxonomy( 'foo', 'post', array() );
+
+		$t = $this->factory->term->create( array(
+			'taxonomy' => 'foo',
+			'name' => 'Kewl Dudez',
+		) );
+
+		$found = term_exists( 'Kewl Dudez', 'foo' );
+
+		_unregister_taxonomy( 'foo' );
+
+		$this->assertInternalType( 'array', $found );
+		$this->assertEquals( $t, $found['term_id'] );
+	}
+
+	public function test_term_exists_taxonomy_empty_parent_empty_match_slug() {
+		register_taxonomy( 'foo', 'post', array() );
+
+		$t = $this->factory->term->create( array(
+			'taxonomy' => 'foo',
+			'name' => 'juicy-fruit',
+		) );
+
+		$found = term_exists( 'juicy-fruit' );
+
+		_unregister_taxonomy( 'foo' );
+
+		$this->assertInternalType( 'string', $found );
+		$this->assertEquals( $t, $found );
+	}
+
+	public function test_term_exists_taxonomy_empty_parent_empty_match_name() {
+		register_taxonomy( 'foo', 'post', array() );
+
+		$t = $this->factory->term->create( array(
+			'taxonomy' => 'foo',
+			'name' => 'Juicy Fruit',
+		) );
+
+		$found = term_exists( 'Juicy Fruit' );
+
+		_unregister_taxonomy( 'foo' );
+
+		$this->assertInternalType( 'string', $found );
+		$this->assertEquals( $t, $found );
+	}
+
+	function test_term_exists_known() {
+		register_taxonomy( 'wptests_tax', 'post' );
+
+		// insert a term
+		$term = rand_str();
+		$t = wp_insert_term( $term, 'wptests_tax' );
+		$this->assertInternalType( 'array', $t );
+		$this->assertEquals( $t['term_id'], term_exists($t['term_id']) );
+		$this->assertEquals( $t['term_id'], term_exists($term) );
+
+		// clean up
+		$this->assertTrue( wp_delete_term( $t['term_id'], 'wptests_tax' ) );
+		_unregister_taxonomy( 'wptests_tax' );
+	}
+
+	function test_term_exists_unknown() {
+		$this->assertNull( term_exists(rand_str()) );
+		$this->assertEquals( 0, term_exists(0) );
+		$this->assertEquals( 0, term_exists('') );
+		$this->assertEquals( 0, term_exists(NULL) );
+	}
+}