diff --git a/tests/phpunit/tests/post/types.php b/tests/phpunit/tests/post/types.php
index e1582d5d8d..31be3359f2 100644
--- a/tests/phpunit/tests/post/types.php
+++ b/tests/phpunit/tests/post/types.php
@@ -24,7 +24,7 @@ class Tests_Post_Types extends WP_UnitTestCase {
 	 *
 	 * @expectedIncorrectUsage register_post_type
 	 */
-	function test_register_post_type_length_long() {
+	function test_register_post_type_with_too_long_name() {
 		// post type too long
 		$this->assertInstanceOf( 'WP_Error', register_post_type( 'abcdefghijklmnopqrstuvwxyz0123456789' ) );
 	}
@@ -34,7 +34,7 @@ class Tests_Post_Types extends WP_UnitTestCase {
 	 *
 	 * @expectedIncorrectUsage register_post_type
 	 */
-	function test_register_post_type_length_short() {
+	function test_register_post_type_with_empty_name() {
 		// post type too short
 		$this->assertInstanceOf( 'WP_Error', register_post_type( '' ) );
 	}
diff --git a/tests/phpunit/tests/taxonomy.php b/tests/phpunit/tests/taxonomy.php
index 529b18cf74..4280928332 100644
--- a/tests/phpunit/tests/taxonomy.php
+++ b/tests/phpunit/tests/taxonomy.php
@@ -153,24 +153,24 @@ class Tests_Taxonomy extends WP_UnitTestCase {
 		unset($GLOBALS['wp_taxonomies'][$tax]);
 	}
 
-	/**
-	 * @ticket 31135
-	 *
-	 * @expectedIncorrectUsage register_taxonomy
-	 */
-	function test_register_short_taxonomy() {
-		$this->assertInstanceOf( 'WP_Error', register_taxonomy( '', 'post', array() ) );
-	}
-
 	/**
 	 * @ticket 21593
 	 *
 	 * @expectedIncorrectUsage register_taxonomy
 	 */
-	function test_register_long_taxonomy() {
+	function test_register_taxonomy_with_too_long_name() {
 		$this->assertInstanceOf( 'WP_Error', register_taxonomy( 'abcdefghijklmnopqrstuvwxyz0123456789', 'post', array() ) );
 	}
 
+	/**
+	 * @ticket 31135
+	 *
+	 * @expectedIncorrectUsage register_taxonomy
+	 */
+	function test_register_taxonomy_with_empty_name() {
+		$this->assertInstanceOf( 'WP_Error', register_taxonomy( '', 'post', array() ) );
+	}
+
 	/**
 	 * @ticket 26948
 	 */