diff --git a/tests/phpunit/tests/error-protection/recovery-mode-key-service.php b/tests/phpunit/tests/error-protection/recovery-mode-key-service.php
index 5d66b4bbff..66f15e6c1e 100644
--- a/tests/phpunit/tests/error-protection/recovery-mode-key-service.php
+++ b/tests/phpunit/tests/error-protection/recovery-mode-key-service.php
@@ -8,8 +8,8 @@ class Tests_Recovery_Mode_Key_Service extends WP_UnitTestCase {
 	/**
 	 * @ticket 46130
 	 *
-	 * @covers WP_Recovery_Mode_Cookie_Service::generate_recovery_mode_token
-	 * @covers WP_Recovery_Mode_Cookie_Service::generate_and_store_recovery_mode_key
+	 * @covers WP_Recovery_Mode_Key_Service::generate_recovery_mode_token
+	 * @covers WP_Recovery_Mode_Key_Service::generate_and_store_recovery_mode_key
 	 */
 	public function test_generate_and_store_recovery_mode_key_returns_recovery_key() {
 		$service = new WP_Recovery_Mode_Key_Service();
@@ -22,7 +22,7 @@ class Tests_Recovery_Mode_Key_Service extends WP_UnitTestCase {
 	/**
 	 * @ticket 46130
 	 *
-	 * @covers WP_Recovery_Mode_Cookie_Service::validate_recovery_mode_key
+	 * @covers WP_Recovery_Mode_Key_Service::validate_recovery_mode_key
 	 */
 	public function test_validate_recovery_mode_key_returns_wp_error_if_no_key_set() {
 		$service = new WP_Recovery_Mode_Key_Service();
@@ -35,7 +35,7 @@ class Tests_Recovery_Mode_Key_Service extends WP_UnitTestCase {
 	/**
 	 * @ticket 46130
 	 *
-	 * @covers WP_Recovery_Mode_Cookie_Service::validate_recovery_mode_key
+	 * @covers WP_Recovery_Mode_Key_Service::validate_recovery_mode_key
 	 */
 	public function test_validate_recovery_mode_key_returns_wp_error_if_data_missing() {
 		update_option( 'recovery_keys', 'gibberish' );
@@ -50,7 +50,7 @@ class Tests_Recovery_Mode_Key_Service extends WP_UnitTestCase {
 	/**
 	 * @ticket 46130
 	 *
-	 * @covers WP_Recovery_Mode_Cookie_Service::validate_recovery_mode_key
+	 * @covers WP_Recovery_Mode_Key_Service::validate_recovery_mode_key
 	 */
 	public function test_validate_recovery_mode_key_returns_wp_error_if_bad() {
 		update_option( 'recovery_keys', array( 'token' => 'gibberish' ) );
@@ -66,7 +66,7 @@ class Tests_Recovery_Mode_Key_Service extends WP_UnitTestCase {
 	/**
 	 * @ticket 46130
 	 *
-	 * @covers WP_Recovery_Mode_Cookie_Service::validate_recovery_mode_key
+	 * @covers WP_Recovery_Mode_Key_Service::validate_recovery_mode_key
 	 */
 	public function test_validate_recovery_mode_key_returns_wp_error_if_stored_format_is_invalid() {
 
@@ -83,7 +83,7 @@ class Tests_Recovery_Mode_Key_Service extends WP_UnitTestCase {
 	/**
 	 * @ticket 46130
 	 *
-	 * @covers WP_Recovery_Mode_Cookie_Service::validate_recovery_mode_key
+	 * @covers WP_Recovery_Mode_Key_Service::validate_recovery_mode_key
 	 */
 	public function test_validate_recovery_mode_key_returns_wp_error_if_empty_key() {
 		$service = new WP_Recovery_Mode_Key_Service();
@@ -98,7 +98,7 @@ class Tests_Recovery_Mode_Key_Service extends WP_UnitTestCase {
 	/**
 	 * @ticket 46130
 	 *
-	 * @covers WP_Recovery_Mode_Cookie_Service::validate_recovery_mode_key
+	 * @covers WP_Recovery_Mode_Key_Service::validate_recovery_mode_key
 	 */
 	public function test_validate_recovery_mode_key_returns_wp_error_if_hash_mismatch() {
 		$service = new WP_Recovery_Mode_Key_Service();
@@ -113,7 +113,7 @@ class Tests_Recovery_Mode_Key_Service extends WP_UnitTestCase {
 	/**
 	 * @ticket 46130
 	 *
-	 * @covers WP_Recovery_Mode_Cookie_Service::validate_recovery_mode_key
+	 * @covers WP_Recovery_Mode_Key_Service::validate_recovery_mode_key
 	 */
 	public function test_validate_recovery_mode_key_returns_wp_error_if_expired() {
 		$service = new WP_Recovery_Mode_Key_Service();
@@ -133,7 +133,7 @@ class Tests_Recovery_Mode_Key_Service extends WP_UnitTestCase {
 	/**
 	 * @ticket 46130
 	 *
-	 * @covers WP_Recovery_Mode_Cookie_Service::validate_recovery_mode_key
+	 * @covers WP_Recovery_Mode_Key_Service::validate_recovery_mode_key
 	 */
 	public function test_validate_recovery_mode_key_returns_true_for_valid_key() {
 		$service = new WP_Recovery_Mode_Key_Service();
@@ -145,7 +145,7 @@ class Tests_Recovery_Mode_Key_Service extends WP_UnitTestCase {
 	/**
 	 * @ticket 46595
 	 *
-	 * @covers WP_Recovery_Mode_Cookie_Service::validate_recovery_mode_key
+	 * @covers WP_Recovery_Mode_Key_Service::validate_recovery_mode_key
 	 */
 	public function test_validate_recovery_mode_key_returns_error_if_token_used_more_than_once() {
 		$service = new WP_Recovery_Mode_Key_Service();
@@ -164,9 +164,9 @@ class Tests_Recovery_Mode_Key_Service extends WP_UnitTestCase {
 	/**
 	 * @ticket 46595
 	 *
-	 * @covers WP_Recovery_Mode_Cookie_Service::generate_recovery_mode_token
-	 * @covers WP_Recovery_Mode_Cookie_Service::generate_and_store_recovery_mode_key
-	 * @covers WP_Recovery_Mode_Cookie_Service::validate_recovery_mode_key
+	 * @covers WP_Recovery_Mode_Key_Service::generate_recovery_mode_token
+	 * @covers WP_Recovery_Mode_Key_Service::generate_and_store_recovery_mode_key
+	 * @covers WP_Recovery_Mode_Key_Service::validate_recovery_mode_key
 	 */
 	public function test_validate_recovery_mode_key_returns_error_if_token_used_more_than_once_more_than_key_stored() {
 		$service = new WP_Recovery_Mode_Key_Service();
@@ -190,7 +190,7 @@ class Tests_Recovery_Mode_Key_Service extends WP_UnitTestCase {
 	/**
 	 * @ticket 46595
 	 *
-	 * @covers WP_Recovery_Mode_Cookie_Service::clean_expired_keys
+	 * @covers WP_Recovery_Mode_Key_Service::clean_expired_keys
 	 */
 	public function test_clean_expired_keys() {
 		$service = new WP_Recovery_Mode_Key_Service();
diff --git a/tests/phpunit/tests/http/http.php b/tests/phpunit/tests/http/http.php
index 6799b12cd9..f8ae30e6c2 100644
--- a/tests/phpunit/tests/http/http.php
+++ b/tests/phpunit/tests/http/http.php
@@ -11,7 +11,7 @@ class Tests_HTTP_HTTP extends WP_UnitTestCase {
 	/**
 	 * @dataProvider make_absolute_url_testcases
 	 *
-	 * @covers ::WP_Http::make_absolute_url
+	 * @covers WP_Http::make_absolute_url
 	 */
 	function test_make_absolute_url( $relative_url, $absolute_url, $expected ) {
 		$actual = WP_Http::make_absolute_url( $relative_url, $absolute_url );