diff --git a/tests/phpunit/tests/http/base.php b/tests/phpunit/tests/http/base.php
index ad487e3f19680..00abf1655bacd 100644
--- a/tests/phpunit/tests/http/base.php
+++ b/tests/phpunit/tests/http/base.php
@@ -8,7 +8,7 @@
  * You may also need `-d safe_mode_gid=1` to relax the safe_mode checks to allow
  * inclusion of PEAR.
  *
- * The WP_HTTP tests require a class-http.php file of r17550 or later.
+ * The WP_Http tests require a class-http.php file of r17550 or later.
  */
 abstract class WP_HTTP_UnitTestCase extends WP_UnitTestCase {
 	// You can use your own version of data/WPHTTP-testcase-redirection-script.php here.
diff --git a/tests/phpunit/tests/http/http.php b/tests/phpunit/tests/http/http.php
index de9dd7332064b..47d169e619326 100644
--- a/tests/phpunit/tests/http/http.php
+++ b/tests/phpunit/tests/http/http.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Non-transport-specific WP_HTTP Tests
+ * Non-transport-specific WP_Http Tests
  *
  * @group http
  */
@@ -581,17 +581,17 @@ public function callback_remove_safe_ports( $ports ) {
 	/**
 	 * Test HTTP Redirects with multiple Location headers specified.
 	 *
-	 * Ensure the WP_HTTP::handle_redirects() method handles multiple Location headers
+	 * Ensure the WP_Http::handle_redirects() method handles multiple Location headers
 	 * and the HTTP request it makes uses the last Location header.
 	 *
 	 * @ticket 16890
 	 * @ticket 57306
 	 *
-	 * @covers WP_HTTP::handle_redirects
+	 * @covers WP_Http::handle_redirects
 	 */
 	public function test_multiple_location_headers() {
 		$pre_http_request_filter_has_run = false;
-		// Filter the response made by WP_HTTP::handle_redirects().
+		// Filter the response made by WP_Http::handle_redirects().
 		add_filter(
 			'pre_http_request',
 			function( $response, $parsed_args, $url ) use ( &$pre_http_request_filter_has_run ) {
@@ -634,7 +634,7 @@ function( $response, $parsed_args, $url ) use ( &$pre_http_request_filter_has_ru
 			),
 		);
 
-		// Test the tests: ensure multiple locations are passed to WP_HTTP::handle_redirects().
+		// Test the tests: ensure multiple locations are passed to WP_Http::handle_redirects().
 		$this->assertIsArray( $headers['location'], 'Location header is expected to be an array.' );
 		$this->assertCount( 2, $headers['location'], 'Location header is expected to contain two values.' );
 
@@ -645,7 +645,7 @@ function( $response, $parsed_args, $url ) use ( &$pre_http_request_filter_has_ru
 			'method'       => 'GET',
 		);
 
-		$redirect_response = WP_HTTP::handle_redirects(
+		$redirect_response = WP_Http::handle_redirects(
 			'http://example.com/?multiple-location-headers=1',
 			$args,
 			array(