diff --git a/tests/phpunit/tests/term.php b/tests/phpunit/tests/term.php
index bd050c55b0..024179b73d 100644
--- a/tests/phpunit/tests/term.php
+++ b/tests/phpunit/tests/term.php
@@ -48,23 +48,6 @@ class Tests_Term extends WP_UnitTestCase {
 		$this->assertTrue( wp_delete_term($t['term_id'], $this->taxonomy) );
 	}
 
-	/**
-	 * @ticket 21651
-	 */
-	function test_get_term_by_tt_id() {
-		$term1 = wp_insert_term( 'Foo', 'category' );
-		$term2 = get_term_by( 'term_taxonomy_id', $term1['term_taxonomy_id'], 'category' );
-		$this->assertEquals( get_term( $term1['term_id'], 'category' ), $term2 );
-	}
-
-	/**
-	 * @ticket 33281
-	 */
-	function test_get_term_by_with_nonexistent_id_should_return_false() {
-		$term = get_term_by( 'id', 123456, 'category' );
-		$this->assertFalse( $term );
-	}
-
 	/**
 	 * @ticket 15919
 	 */
diff --git a/tests/phpunit/tests/term/getTermBy.php b/tests/phpunit/tests/term/getTermBy.php
new file mode 100644
index 0000000000..f5a2162d50
--- /dev/null
+++ b/tests/phpunit/tests/term/getTermBy.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * @group taxonomy
+ */
+class Tests_Term_GetTermBy extends WP_UnitTestCase {
+	/**
+	 * @ticket 21651
+	 */
+	function test_get_term_by_tt_id() {
+		$term1 = wp_insert_term( 'Foo', 'category' );
+		$term2 = get_term_by( 'term_taxonomy_id', $term1['term_taxonomy_id'], 'category' );
+		$this->assertEquals( get_term( $term1['term_id'], 'category' ), $term2 );
+	}
+
+	/**
+	 * @ticket 33281
+	 */
+	function test_get_term_by_with_nonexistent_id_should_return_false() {
+		$term = get_term_by( 'id', 123456, 'category' );
+		$this->assertFalse( $term );
+	}
+}