diff --git a/tests/phpunit/tests/ajax/QuickEdit.php b/tests/phpunit/tests/ajax/QuickEdit.php
index 3f9da0465e..93170fa89a 100644
--- a/tests/phpunit/tests/ajax/QuickEdit.php
+++ b/tests/phpunit/tests/ajax/QuickEdit.php
@@ -13,7 +13,7 @@ require_once( ABSPATH . 'wp-admin/includes/ajax-actions.php' );
 class Tests_Ajax_QuickEdit extends WP_Ajax_UnitTestCase {
 
 	/**
-	 * @group 26948
+	 * @ticket 26948
 	 */
 	public function test_dont_process_terms_if_taxonomy_does_not_allow_show_on_quick_edit() {
 		register_taxonomy( 'wptests_tax_1', 'post', array(
diff --git a/tests/phpunit/tests/cache.php b/tests/phpunit/tests/cache.php
index 87028c5ce2..df799e280d 100644
--- a/tests/phpunit/tests/cache.php
+++ b/tests/phpunit/tests/cache.php
@@ -180,7 +180,7 @@ class Tests_Cache extends WP_UnitTestCase {
 	}
 
 	/**
-	 * @group 21327
+	 * @ticket 21327
 	 */
 	function test_wp_cache_decr() {
 		$key = rand_str();
diff --git a/tests/phpunit/tests/comment.php b/tests/phpunit/tests/comment.php
index 3b80334353..c2fc51b9d8 100644
--- a/tests/phpunit/tests/comment.php
+++ b/tests/phpunit/tests/comment.php
@@ -402,7 +402,7 @@ class Tests_Comment extends WP_UnitTestCase {
 	}
 
 	/**
-	 * @group 27571
+	 * @ticket 27571
 	 */
 	public function test_post_properties_should_be_lazyloaded() {
 		$c = self::factory()->comment->create( array( 'comment_post_ID' => self::$post_id ) );
diff --git a/tests/phpunit/tests/comment/metaCache.php b/tests/phpunit/tests/comment/metaCache.php
index 166ad25782..27f97fb40d 100644
--- a/tests/phpunit/tests/comment/metaCache.php
+++ b/tests/phpunit/tests/comment/metaCache.php
@@ -123,7 +123,7 @@ class Tests_Comment_Meta_Cache extends WP_UnitTestCase {
 	}
 
 	/**
-	 * @group 34047
+	 * @ticket 34047
 	 */
 	public function test_comment_meta_should_be_lazy_loaded_in_comment_feed_queries() {
 		global $wpdb;
@@ -167,7 +167,7 @@ class Tests_Comment_Meta_Cache extends WP_UnitTestCase {
 	}
 
 	/**
-	 * @group 34047
+	 * @ticket 34047
 	 */
 	public function test_comment_meta_should_be_lazy_loaded_in_single_post_comment_feed_queries() {
 		global $wpdb;
diff --git a/tests/phpunit/tests/comment/query.php b/tests/phpunit/tests/comment/query.php
index 54015eb47a..27a0934869 100644
--- a/tests/phpunit/tests/comment/query.php
+++ b/tests/phpunit/tests/comment/query.php
@@ -768,7 +768,7 @@ class Tests_Comment_Query extends WP_UnitTestCase {
 	}
 
 	/**
-	 * @group 32081
+	 * @ticket 32081
 	 */
 	public function test_meta_query_should_work_with_comment__in() {
 		$comments = self::factory()->comment->create_many( 3 );
@@ -792,7 +792,7 @@ class Tests_Comment_Query extends WP_UnitTestCase {
 	}
 
 	/**
-	 * @group 32081
+	 * @ticket 32081
 	 */
 	public function test_meta_query_should_work_with_comment__not_in() {
 		$comments = self::factory()->comment->create_many( 3 );
diff --git a/tests/phpunit/tests/option/updateOption.php b/tests/phpunit/tests/option/updateOption.php
index 01064ca187..32ae5e5b4e 100644
--- a/tests/phpunit/tests/option/updateOption.php
+++ b/tests/phpunit/tests/option/updateOption.php
@@ -99,7 +99,7 @@ class Tests_Option_UpdateOption extends WP_UnitTestCase {
 	}
 
 	/**
-	 * @group 26394
+	 * @ticket 26394
 	 */
 	public function test_autoload_should_be_updated_for_existing_option_when_value_is_changed() {
 		global $wpdb;
@@ -120,7 +120,7 @@ class Tests_Option_UpdateOption extends WP_UnitTestCase {
 	}
 
 	/**
-	 * @group 26394
+	 * @ticket 26394
 	 */
 	public function test_autoload_should_not_be_updated_for_existing_option_when_value_is_unchanged() {
 		global $wpdb;
@@ -142,7 +142,7 @@ class Tests_Option_UpdateOption extends WP_UnitTestCase {
 	}
 
 	/**
-	 * @group 26394
+	 * @ticket 26394
 	 */
 	public function test_autoload_should_not_be_updated_for_existing_option_when_value_is_changed_but_no_value_of_autoload_is_provided() {
 		global $wpdb;
diff --git a/tests/phpunit/tests/query/isTerm.php b/tests/phpunit/tests/query/isTerm.php
index c9a41601c1..787fd67f3a 100644
--- a/tests/phpunit/tests/query/isTerm.php
+++ b/tests/phpunit/tests/query/isTerm.php
@@ -181,7 +181,7 @@ class Tests_Query_IsTerm extends WP_UnitTestCase {
 	}
 
 	/**
-	 * @group 30623
+	 * @ticket 30623
 	 */
 	public function test_get_queried_object_with_custom_taxonomy_tax_query_and_field_term_id_should_return_term_object() {
 		// Don't override the args provided below.
@@ -209,7 +209,7 @@ class Tests_Query_IsTerm extends WP_UnitTestCase {
 	}
 
 	/**
-	 * @group 30623
+	 * @ticket 30623
 	 */
 	public function test_get_queried_object_with_custom_taxonomy_tax_query_and_field_slug_should_return_term_object() {
 		// Don't override the args provided below.
@@ -238,7 +238,7 @@ class Tests_Query_IsTerm extends WP_UnitTestCase {
 	}
 
 	/**
-	 * @group 30623
+	 * @ticket 30623
 	 */
 	public function test_get_queried_object_with_custom_taxonomy_tax_query_with_multiple_clauses_should_return_term_object_corresponding_to_the_first_queried_tax() {
 		// Don't override the args provided below.
diff --git a/tests/phpunit/tests/taxonomy.php b/tests/phpunit/tests/taxonomy.php
index 4179bf4875..ea84d7a777 100644
--- a/tests/phpunit/tests/taxonomy.php
+++ b/tests/phpunit/tests/taxonomy.php
@@ -50,7 +50,7 @@ class Tests_Taxonomy extends WP_UnitTestCase {
 	}
 
 	/**
-	 * @group 27238
+	 * @ticket 27238
 	 */
 	public function test_get_the_taxonomies_term_template() {
 		$post_id = self::factory()->post->create();
@@ -76,7 +76,7 @@ class Tests_Taxonomy extends WP_UnitTestCase {
 	}
 
 	/**
-	 * @group 27238
+	 * @ticket 27238
 	 */
 	function test_the_taxonomies_term_template() {
 		$post_id = self::factory()->post->create();
diff --git a/tests/phpunit/tests/user/wpDeleteUser.php b/tests/phpunit/tests/user/wpDeleteUser.php
index 20d54c92c2..2e249896c9 100644
--- a/tests/phpunit/tests/user/wpDeleteUser.php
+++ b/tests/phpunit/tests/user/wpDeleteUser.php
@@ -136,14 +136,14 @@ class Tests_User_WpDeleteUser extends WP_UnitTestCase {
 	}
 
 	/**
-	 * @group 33800
+	 * @ticket 33800
 	 */
 	public function test_should_return_false_for_non_numeric_string_user_id() {
 		$this->assertFalse( wp_delete_user( 'abcde' ) );
 	}
 
 	/**
-	 * @group 33800
+	 * @ticket 33800
 	 */
 	public function test_should_return_false_for_object_user_id() {
 		if ( is_multisite() ) {