diff --git a/tests/phpunit/tests/formatting/linksAddBaseUrl.php b/tests/phpunit/tests/formatting/linksAddBaseUrl.php
index 0d88cc061a564..cbc8489a500e0 100644
--- a/tests/phpunit/tests/formatting/linksAddBaseUrl.php
+++ b/tests/phpunit/tests/formatting/linksAddBaseUrl.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * Tests for the links_add_base_url function.
+ * Tests for the links_add_base_url() function.
  *
  * @group formatting
  *
  * @covers ::links_add_base_url
  */
-class Tests_formatting_linksAddBaseUrl extends WP_UnitTestCase {
+class Tests_Formatting_LinksAddBaseUrl extends WP_UnitTestCase {
 
 	/**
 	 * @ticket 60389
@@ -15,17 +15,24 @@ class Tests_formatting_linksAddBaseUrl extends WP_UnitTestCase {
 	 * @dataProvider data_links_add_base_url
 	 */
 	public function test_links_add_base_url( $content, $base, $attrs, $expected ) {
-		if ( $attrs ) {
-			$this->assertSame( $expected, links_add_base_url( $content, $base, $attrs ) );
-		} else {
+		if ( is_null( $attrs ) ) {
 			$this->assertSame( $expected, links_add_base_url( $content, $base ) );
+		} else {
+			$this->assertSame( $expected, links_add_base_url( $content, $base, $attrs ) );
 		}
 	}
 
 	/**
-	 * Data provider for test_links_add_base_url().
+	 * Data provider.
 	 *
-	 * @return array[]
+	 * @return array {
+	 *     @type array {
+	 *         @type string     $content  String to search for links in.
+	 *         @type string     $base     The base URL to prefix to links.
+	 *         @type array|null $attrs    The attributes which should be processed.
+	 *         @type string     $expected Expected output.
+	 *     }
+	 * }
 	 */
 	public function data_links_add_base_url() {
 		return array(
@@ -41,19 +48,19 @@ public function data_links_add_base_url() {
 				'attrs'    => null,
 				'expected' => '<a href="http://localhost/url" />',
 			),
-			'relative_scheme' => array(
+			'relative scheme' => array(
 				'content'  => '<a href="//localhost/url" />',
 				'base'     => 'http://localhost',
 				'attrs'    => null,
 				'expected' => '<a href="http://localhost/url" />',
 			),
-			'empty_array'     => array(
+			'empty array'     => array(
 				'content'  => '<a href="url" target="_blank" />',
 				'base'     => 'https://localhost',
 				'attrs'    => array(),
-				'expected' => '<a href="https://localhost/url" target="_blank" />',
+				'expected' => '<a href="https://localhost/url" target="https://localhost/_blank" />',
 			),
-			'data_url'        => array(
+			'data-url'        => array(
 				'content'  => '<a href="url" data-url="url" />',
 				'base'     => 'https://localhost',
 				'attrs'    => array( 'data-url', 'href' ),
@@ -65,7 +72,7 @@ public function data_links_add_base_url() {
 				'attrs'    => null,
 				'expected' => '<a href="https://localhost/url" />',
 			),
-			'no_href'         => array(
+			'no href'         => array(
 				'content'  => '<a data-url="/url" />',
 				'base'     => 'https://localhost',
 				'attrs'    => null,
diff --git a/tests/phpunit/tests/formatting/linksAddTarget.php b/tests/phpunit/tests/formatting/linksAddTarget.php
index 1c9a6fedf3016..31bc4cdcb3b84 100644
--- a/tests/phpunit/tests/formatting/linksAddTarget.php
+++ b/tests/phpunit/tests/formatting/linksAddTarget.php
@@ -1,5 +1,7 @@
 <?php
 /**
+ * Tests for the links_add_target() function.
+ *
  * @group formatting
  *
  * @covers ::links_add_target
@@ -7,7 +9,7 @@
 class Tests_Formatting_LinksAddTarget extends WP_UnitTestCase {
 
 	/**
-	 * Tests the links_add_target() function.
+	 * @ticket 26164
 	 *
 	 * @dataProvider data_links_add_target
 	 */
@@ -26,10 +28,10 @@ public function test_links_add_target( $content, $target, $tags, $expected ) {
 	 *
 	 * @return array {
 	 *     @type array {
-	 *         @type string $content  String to search for links in.
-	 *         @type string $target   The target to add to the links.
-	 *         @type string $tags     An array of tags to apply to.
-	 *         @type string $expected Expected output.
+	 *         @type string     $content  String to search for links in.
+	 *         @type string     $target   The target to add to the links.
+	 *         @type array|null $tags     An array of tags to apply to.
+	 *         @type string     $expected Expected output.
 	 *     }
 	 * }
 	 */