diff --git a/tests/phpunit/tests/category.php b/tests/phpunit/tests/category.php
deleted file mode 100644
index 1eb4f3d419..0000000000
--- a/tests/phpunit/tests/category.php
+++ /dev/null
@@ -1,257 +0,0 @@
-<?php
-/**
- * Validate Category API
- *
- * Notes:
- * cat_is_ancestor_of is validated under test\term\term_is_ancestor_of
- *
- * @group category.php
- */
-class Tests_Category extends WP_UnitTestCase {
-
-	public function tear_down() {
-		_unregister_taxonomy( 'test_tax_cat' );
-		parent::tear_down();
-	}
-
-	/**
-	 * Validate get_all_category_ids
-	 *
-	 * @expectedDeprecated get_all_category_ids
-	 *
-	 * @covers ::get_all_category_ids
-	 */
-	public function test_get_all_category_ids() {
-		// Ccreate categories.
-		self::factory()->category->create_many( 2 );
-
-		// Create new taxonomy to ensure not included.
-		register_taxonomy( 'test_tax_cat', 'post' );
-		wp_insert_term( 'test1', 'test_tax_cat' );
-
-		// Validate length is 1 + created due to uncategorized.
-		$cat_ids = get_all_category_ids();
-		$this->assertCount( 3, $cat_ids );
-	}
-
-	/**
-	 * Validate get_category_by_slug function
-	 *
-	 * @covers ::get_category_by_slug
-	 */
-	public function test_get_category_by_slug() {
-
-		// Create test categories.
-		$testcat  = self::factory()->category->create_and_get(
-			array(
-				'slug' => 'testcat',
-				'name' => 'Test Category 1',
-			)
-		);
-		$testcat2 = self::factory()->category->create_and_get(
-			array(
-				'slug' => 'testcat2',
-				'name' => 'Test Category 2',
-			)
-		);
-
-		// Validate category is returned by slug.
-		$ret_testcat = get_category_by_slug( 'testcat' );
-		$this->assertSame( $testcat->term_id, $ret_testcat->term_id );
-		$ret_testcat = get_category_by_slug( 'TeStCaT' );
-		$this->assertSame( $testcat->term_id, $ret_testcat->term_id );
-
-		// Validate unknown category returns false.
-		$this->assertFalse( get_category_by_slug( 'testcat3' ) );
-
-	}
-
-	/**
-	 * Validate _make_cat_compat function
-	 *
-	 * @covers ::_make_cat_compat
-	 */
-	public function test__make_cat_compat() {
-
-		// Create test categories and array representations.
-		$testcat_array            = array(
-			'slug'        => 'testmcc',
-			'name'        => 'Test MCC',
-			'description' => 'Category Test',
-		);
-		$testcat                  = self::factory()->category->create_and_get( $testcat_array );
-		$testcat_array['term_id'] = $testcat->term_id;
-
-		$testcat2_array            = array(
-			'slug'        => 'testmcc',
-			'name'        => 'Test MCC',
-			'description' => 'Category Test',
-			'parent'      => $testcat->term_id,
-		);
-		$testcat2                  = self::factory()->category->create_and_get( $testcat2_array );
-		$testcat2_array['term_id'] = $testcat2->term_id;
-
-		// Unset properties to enable validation of object.
-		unset( $testcat->cat_ID );
-		unset( $testcat->category_count );
-		unset( $testcat->category_description );
-		unset( $testcat->cat_name );
-		unset( $testcat->category_nicename );
-		unset( $testcat->category_parent );
-
-		unset( $testcat2->cat_ID );
-		unset( $testcat2->category_count );
-		unset( $testcat2->category_description );
-		unset( $testcat2->cat_name );
-		unset( $testcat2->category_nicename );
-		unset( $testcat2->category_parent );
-
-		// Make compatible.
-		_make_cat_compat( $testcat );
-		_make_cat_compat( $testcat2 );
-		_make_cat_compat( $testcat_array );
-		_make_cat_compat( $testcat2_array );
-
-		// Validate compatibility object.
-		$this->assertSame( $testcat->cat_ID, $testcat->term_id );
-		$this->assertSame( $testcat->category_count, $testcat->count );
-		$this->assertSame( $testcat->category_description, $testcat->description );
-		$this->assertSame( $testcat->cat_name, $testcat->name );
-		$this->assertSame( $testcat->category_nicename, $testcat->slug );
-		$this->assertSame( $testcat->category_parent, $testcat->parent );
-
-		// Validate compatibility object with parent.
-		$this->assertSame( $testcat->cat_ID, $testcat->term_id );
-		$this->assertSame( $testcat->category_count, $testcat->count );
-		$this->assertSame( $testcat->category_description, $testcat->description );
-		$this->assertSame( $testcat->cat_name, $testcat->name );
-		$this->assertSame( $testcat->category_nicename, $testcat->slug );
-		$this->assertSame( $testcat->category_parent, $testcat->parent );
-
-		// Validate compatibility array.
-		$this->assertSame( $testcat_array['cat_ID'], $testcat_array['term_id'] );
-		$this->assertSame( $testcat_array['category_count'], $testcat_array['count'] );
-		$this->assertSame( $testcat_array['category_description'], $testcat_array['description'] );
-		$this->assertSame( $testcat_array['cat_name'], $testcat_array['name'] );
-		$this->assertSame( $testcat_array['category_nicename'], $testcat_array['slug'] );
-		$this->assertSame( $testcat_array['category_parent'], $testcat_array['parent'] );
-
-		// Validate compatibility array with parent.
-		$this->assertSame( $testcat_array['cat_ID'], $testcat_array['term_id'] );
-		$this->assertSame( $testcat_array['category_count'], $testcat_array['count'] );
-		$this->assertSame( $testcat_array['category_description'], $testcat_array['description'] );
-		$this->assertSame( $testcat_array['cat_name'], $testcat_array['name'] );
-		$this->assertSame( $testcat_array['category_nicename'], $testcat_array['slug'] );
-		$this->assertSame( $testcat_array['category_parent'], $testcat_array['parent'] );
-	}
-
-	/**
-	 * Validate get_cat_name function
-	 *
-	 * @covers ::get_cat_name
-	 */
-	public function test_get_cat_name() {
-
-		// Create test category.
-		$testcat = self::factory()->category->create_and_get(
-			array(
-				'slug' => 'testcat',
-				'name' => 'Test Category 1',
-			)
-		);
-
-		// Validate.
-		$this->assertSame( $testcat->name, get_cat_name( $testcat->term_id ) );
-		$this->assertSame( '', get_cat_name( -1 ) );
-		$this->assertSame( '', get_cat_name( $testcat->term_id + 100 ) );
-
-	}
-
-	/**
-	 * Validate get_cat_name function
-	 *
-	 * @covers ::get_cat_ID
-	 */
-	public function test_get_cat_ID() {
-
-		// Create test category.
-		$testcat = self::factory()->category->create_and_get(
-			array(
-				'slug' => 'testcat',
-				'name' => 'Test Category 1',
-			)
-		);
-
-		// Validate.
-		$this->assertSame( $testcat->term_id, get_cat_ID( $testcat->name ) );
-		$this->assertSame( 0, get_cat_ID( 'NO CAT' ) );
-		$this->assertSame( 0, get_cat_ID( 12 ) );
-
-	}
-
-	/**
-	 * Validate get_category_by_path function
-	 *
-	 * @covers ::get_category_by_path
-	 */
-	public function test_get_category_by_path() {
-
-		// Create test categories.
-		$root_id           = self::factory()->category->create(
-			array(
-				'slug' => 'root',
-			)
-		);
-		$root_cat_id       = self::factory()->category->create(
-			array(
-				'slug'   => 'cat',
-				'parent' => $root_id,
-			)
-		);
-		$root_cat_cat_id   = self::factory()->category->create(
-			array(
-				'slug'   => 'cat', // Note this is modified on create.
-				'parent' => $root_cat_id,
-			)
-		);
-		$root_path_id      = self::factory()->category->create(
-			array(
-				'slug'   => 'path',
-				'parent' => $root_id,
-			)
-		);
-		$root_path_cat_id  = self::factory()->category->create(
-			array(
-				'slug'   => 'cat', // Note this is modified on create.
-				'parent' => $root_path_id,
-			)
-		);
-		$root_level_id     = self::factory()->category->create(
-			array(
-				'slug'   => 'level-1',
-				'parent' => $root_id,
-			)
-		);
-		$root_level_cat_id = self::factory()->category->create(
-			array(
-				'slug'   => 'cat', // Note this is modified on create.
-				'parent' => $root_level_id,
-			)
-		);
-
-		// Validate full match.
-		$ret_cat = get_category_by_path( '/root/level-1', true );
-		$this->assertSame( $root_level_id, $ret_cat->term_id );
-		$this->assertNull( get_category_by_path( 'level-1', true ) );
-		$this->assertNull( get_category_by_path( 'nocat/nocat/', true ) );
-
-		// Validate partial match.
-		$ret_cat = get_category_by_path( 'level-1', false );
-		$this->assertSame( $root_level_id, $ret_cat->term_id );
-		$ret_cat = get_category_by_path( 'root/cat/level-1', false );
-		$this->assertSame( $root_level_id, $ret_cat->term_id );
-		$ret_cat = get_category_by_path( 'root$2Fcat%20%2Flevel-1', false );
-		$this->assertSame( $root_level_id, $ret_cat->term_id );
-		$this->assertNull( get_category_by_path( 'nocat/nocat/', false ) );
-	}
-}
diff --git a/tests/phpunit/tests/category/getAllCategoryIds.php b/tests/phpunit/tests/category/getAllCategoryIds.php
new file mode 100644
index 0000000000..21d2fed5ec
--- /dev/null
+++ b/tests/phpunit/tests/category/getAllCategoryIds.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * @group taxonomy
+ * @group category.php
+ *
+ * @covers ::get_all_category_ids
+ */
+class Tests_Category_GetAllCategoryIds extends WP_UnitTestCase {
+
+	/**
+	 * Validate get_all_category_ids
+	 *
+	 * @expectedDeprecated get_all_category_ids
+	 */
+	public function test_get_all_category_ids() {
+		// Ccreate categories.
+		self::factory()->category->create_many( 2 );
+
+		// Create new taxonomy to ensure not included.
+		register_taxonomy( 'test_tax_cat', 'post' );
+
+		wp_insert_term( 'test1', 'test_tax_cat' );
+		$cat_ids = get_all_category_ids();
+
+		_unregister_taxonomy( 'test_tax_cat' );
+
+		// Validate length is 1 + created due to uncategorized.
+		$this->assertCount( 3, $cat_ids );
+	}
+}
diff --git a/tests/phpunit/tests/category/getCatId.php b/tests/phpunit/tests/category/getCatId.php
new file mode 100644
index 0000000000..b5118d8233
--- /dev/null
+++ b/tests/phpunit/tests/category/getCatId.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * @group taxonomy
+ * @group category.php
+ *
+ * @covers ::get_cat_ID
+ */
+class Tests_Category_GetCatId extends WP_UnitTestCase {
+
+	/**
+	 * Validate get_cat_ID function
+	 */
+	public function test_get_cat_ID() {
+
+		// Create test category.
+		$testcat = self::factory()->category->create_and_get(
+			array(
+				'slug' => 'testcat',
+				'name' => 'Test Category 1',
+			)
+		);
+
+		// Validate.
+		$this->assertSame( $testcat->term_id, get_cat_ID( $testcat->name ) );
+		$this->assertSame( 0, get_cat_ID( 'NO CAT' ) );
+		$this->assertSame( 0, get_cat_ID( 12 ) );
+
+	}
+}
diff --git a/tests/phpunit/tests/category/getCatName.php b/tests/phpunit/tests/category/getCatName.php
new file mode 100644
index 0000000000..bc333a2b46
--- /dev/null
+++ b/tests/phpunit/tests/category/getCatName.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * @group taxonomy
+ * @group category.php
+ *
+ * @covers ::get_cat_name
+ */
+class Tests_Category_GetCatName extends WP_UnitTestCase {
+
+	/**
+	 * Validate get_cat_name function
+	 */
+	public function test_get_cat_name() {
+
+		// Create test category.
+		$testcat = self::factory()->category->create_and_get(
+			array(
+				'slug' => 'testcat',
+				'name' => 'Test Category 1',
+			)
+		);
+
+		// Validate.
+		$this->assertSame( $testcat->name, get_cat_name( $testcat->term_id ) );
+		$this->assertSame( '', get_cat_name( -1 ) );
+		$this->assertSame( '', get_cat_name( $testcat->term_id + 100 ) );
+
+	}
+}
diff --git a/tests/phpunit/tests/category/getCategoryByPath.php b/tests/phpunit/tests/category/getCategoryByPath.php
new file mode 100644
index 0000000000..e4d34f2458
--- /dev/null
+++ b/tests/phpunit/tests/category/getCategoryByPath.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * @group taxonomy
+ * @group category.php
+ *
+ * @covers ::get_category_by_path
+ */
+class Tests_Category_GetCategoryByPath extends WP_UnitTestCase {
+
+	/**
+	 * Validate get_category_by_path function
+	 */
+	public function test_get_category_by_path() {
+
+		// Create test categories.
+		$root_id           = self::factory()->category->create(
+			array(
+				'slug' => 'root',
+			)
+		);
+		$root_cat_id       = self::factory()->category->create(
+			array(
+				'slug'   => 'cat',
+				'parent' => $root_id,
+			)
+		);
+		$root_cat_cat_id   = self::factory()->category->create(
+			array(
+				'slug'   => 'cat', // Note this is modified on create.
+				'parent' => $root_cat_id,
+			)
+		);
+		$root_path_id      = self::factory()->category->create(
+			array(
+				'slug'   => 'path',
+				'parent' => $root_id,
+			)
+		);
+		$root_path_cat_id  = self::factory()->category->create(
+			array(
+				'slug'   => 'cat', // Note this is modified on create.
+				'parent' => $root_path_id,
+			)
+		);
+		$root_level_id     = self::factory()->category->create(
+			array(
+				'slug'   => 'level-1',
+				'parent' => $root_id,
+			)
+		);
+		$root_level_cat_id = self::factory()->category->create(
+			array(
+				'slug'   => 'cat', // Note this is modified on create.
+				'parent' => $root_level_id,
+			)
+		);
+
+		// Validate full match.
+		$ret_cat = get_category_by_path( '/root/level-1', true );
+		$this->assertSame( $root_level_id, $ret_cat->term_id );
+		$this->assertNull( get_category_by_path( 'level-1', true ) );
+		$this->assertNull( get_category_by_path( 'nocat/nocat/', true ) );
+
+		// Validate partial match.
+		$ret_cat = get_category_by_path( 'level-1', false );
+		$this->assertSame( $root_level_id, $ret_cat->term_id );
+		$ret_cat = get_category_by_path( 'root/cat/level-1', false );
+		$this->assertSame( $root_level_id, $ret_cat->term_id );
+		$ret_cat = get_category_by_path( 'root$2Fcat%20%2Flevel-1', false );
+		$this->assertSame( $root_level_id, $ret_cat->term_id );
+		$this->assertNull( get_category_by_path( 'nocat/nocat/', false ) );
+	}
+}
diff --git a/tests/phpunit/tests/category/getCategoryBySlug.php b/tests/phpunit/tests/category/getCategoryBySlug.php
new file mode 100644
index 0000000000..f7c0a3b886
--- /dev/null
+++ b/tests/phpunit/tests/category/getCategoryBySlug.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * @group taxonomy
+ * @group category.php
+ *
+ * @covers ::get_category_by_slug
+ */
+class Tests_Category_GetCategoryBySlug extends WP_UnitTestCase {
+
+	/**
+	 * Validate get_category_by_slug function
+	 */
+	public function test_get_category_by_slug() {
+
+		// Create test categories.
+		$testcat  = self::factory()->category->create_and_get(
+			array(
+				'slug' => 'testcat',
+				'name' => 'Test Category 1',
+			)
+		);
+		$testcat2 = self::factory()->category->create_and_get(
+			array(
+				'slug' => 'testcat2',
+				'name' => 'Test Category 2',
+			)
+		);
+
+		// Validate category is returned by slug.
+		$ret_testcat = get_category_by_slug( 'testcat' );
+		$this->assertSame( $testcat->term_id, $ret_testcat->term_id );
+		$ret_testcat = get_category_by_slug( 'TeStCaT' );
+		$this->assertSame( $testcat->term_id, $ret_testcat->term_id );
+
+		// Validate unknown category returns false.
+		$this->assertFalse( get_category_by_slug( 'testcat3' ) );
+
+	}
+}
diff --git a/tests/phpunit/tests/category/makeCatCompat.php b/tests/phpunit/tests/category/makeCatCompat.php
new file mode 100644
index 0000000000..17999228c5
--- /dev/null
+++ b/tests/phpunit/tests/category/makeCatCompat.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * @group taxonomy
+ * @group category.php
+ *
+ * @covers ::_make_cat_compat
+ */
+class Tests_Category_MakeCatCompat extends WP_UnitTestCase {
+
+	/**
+	 * Validate _make_cat_compat function
+	 */
+	public function test__make_cat_compat() {
+
+		// Create test categories and array representations.
+		$testcat_array            = array(
+			'slug'        => 'testmcc',
+			'name'        => 'Test MCC',
+			'description' => 'Category Test',
+		);
+		$testcat                  = self::factory()->category->create_and_get( $testcat_array );
+		$testcat_array['term_id'] = $testcat->term_id;
+
+		$testcat2_array            = array(
+			'slug'        => 'testmcc',
+			'name'        => 'Test MCC',
+			'description' => 'Category Test',
+			'parent'      => $testcat->term_id,
+		);
+		$testcat2                  = self::factory()->category->create_and_get( $testcat2_array );
+		$testcat2_array['term_id'] = $testcat2->term_id;
+
+		// Unset properties to enable validation of object.
+		unset( $testcat->cat_ID );
+		unset( $testcat->category_count );
+		unset( $testcat->category_description );
+		unset( $testcat->cat_name );
+		unset( $testcat->category_nicename );
+		unset( $testcat->category_parent );
+
+		unset( $testcat2->cat_ID );
+		unset( $testcat2->category_count );
+		unset( $testcat2->category_description );
+		unset( $testcat2->cat_name );
+		unset( $testcat2->category_nicename );
+		unset( $testcat2->category_parent );
+
+		// Make compatible.
+		_make_cat_compat( $testcat );
+		_make_cat_compat( $testcat2 );
+		_make_cat_compat( $testcat_array );
+		_make_cat_compat( $testcat2_array );
+
+		// Validate compatibility object.
+		$this->assertSame( $testcat->cat_ID, $testcat->term_id );
+		$this->assertSame( $testcat->category_count, $testcat->count );
+		$this->assertSame( $testcat->category_description, $testcat->description );
+		$this->assertSame( $testcat->cat_name, $testcat->name );
+		$this->assertSame( $testcat->category_nicename, $testcat->slug );
+		$this->assertSame( $testcat->category_parent, $testcat->parent );
+
+		// Validate compatibility object with parent.
+		$this->assertSame( $testcat->cat_ID, $testcat->term_id );
+		$this->assertSame( $testcat->category_count, $testcat->count );
+		$this->assertSame( $testcat->category_description, $testcat->description );
+		$this->assertSame( $testcat->cat_name, $testcat->name );
+		$this->assertSame( $testcat->category_nicename, $testcat->slug );
+		$this->assertSame( $testcat->category_parent, $testcat->parent );
+
+		// Validate compatibility array.
+		$this->assertSame( $testcat_array['cat_ID'], $testcat_array['term_id'] );
+		$this->assertSame( $testcat_array['category_count'], $testcat_array['count'] );
+		$this->assertSame( $testcat_array['category_description'], $testcat_array['description'] );
+		$this->assertSame( $testcat_array['cat_name'], $testcat_array['name'] );
+		$this->assertSame( $testcat_array['category_nicename'], $testcat_array['slug'] );
+		$this->assertSame( $testcat_array['category_parent'], $testcat_array['parent'] );
+
+		// Validate compatibility array with parent.
+		$this->assertSame( $testcat_array['cat_ID'], $testcat_array['term_id'] );
+		$this->assertSame( $testcat_array['category_count'], $testcat_array['count'] );
+		$this->assertSame( $testcat_array['category_description'], $testcat_array['description'] );
+		$this->assertSame( $testcat_array['cat_name'], $testcat_array['name'] );
+		$this->assertSame( $testcat_array['category_nicename'], $testcat_array['slug'] );
+		$this->assertSame( $testcat_array['category_parent'], $testcat_array['parent'] );
+	}
+}