Index: tests/phpunit/tests/formatting/balanceTags.php
===================================================================
--- tests/phpunit/tests/formatting/balanceTags.php	(revision 26363)
+++ tests/phpunit/tests/formatting/balanceTags.php	(working copy)
@@ -7,7 +7,7 @@
 
 	function nestable_tags() {
 		return array(
-			array( 'blockquote', 'div', 'object', 'q', 'span' )
+			array( 'blockquote' ), array( 'div' ), array( 'object' ), array( 'q' ), array( 'span' ),
 		);
 	}
 
@@ -20,28 +20,9 @@
 		);
 	}
 
-	// These are single/self-closing tags that WP has traditionally recognized.
-	function basic_single_tags() {
-		return array(
-			array( 'br' ), array( 'hr' ), array( 'img' ), array( 'input' )
-		);
-	}
-
 	/**
-	 * These are single tags WP has traditionally properly handled
-	 * This test can be removed if #1597 is fixed and the next test passes, as
-	 * it supercedes this test.
-	 *
-	 * @dataProvider basic_single_tags
-	 */
-	function test_selfcloses_unclosed_basic_known_single_tags( $tag ) {
-		$this->assertEquals( "<$tag />", balanceTags( "<$tag>", true ) );
-	}
-
-	/**
 	 * If a recognized valid single tag appears unclosed, it should get self-closed
 	 *
-	 * @ticket 1597
 	 * @dataProvider single_tags
 	 */
 	function test_selfcloses_unclosed_known_single_tags( $tag ) {
@@ -49,30 +30,15 @@
 	}
 
 	/**
-	 * These are single tags WP has traditionally properly handled
-	 * This test can be removed if #1597 is fixed and the next test passes, as
-	 * it supercedes this test.
-	 *
-	 * @dataProvider basic_single_tags
-	 */
-	function test_selfcloses_basic_known_single_tags_having_closing_tag( $tag ) {
-		$this->assertEquals( "<$tag />", balanceTags( "<$tag></$tag>", true ) );
-	}
-
-	/**
 	 * If a recognized valid single tag is given a closing tag, the closing tag
 	 *   should get removed and tag should be self-closed.
 	 *
-	 * @ticket 1597
 	 * @dataProvider single_tags
 	 */
 	function test_selfcloses_known_single_tags_having_closing_tag( $tag ) {
 		$this->assertEquals( "<$tag />", balanceTags( "<$tag></$tag>", true ) );
 	}
 
-	/**
-	 * @ticket 1597
-	 */
 	function test_closes_unknown_single_tags_with_closing_tag() {
 
 		$inputs = array(
@@ -121,16 +87,19 @@
 		}
 	}
 
-	function test_balances_nestable_tags() {
+	/**
+	 * @dataProvider nestable_tags
+	 */
+	function test_balances_nestable_tags( $tag ) {
 		$inputs = array(
-			'<q>Test<q>Test</q>',
-			'<div><div>Test',
-			'<div>Test</div></div>',
+			"<$tag>Test<$tag>Test</$tag>",
+			"<$tag><$tag>Test",
+			"<$tag>Test</$tag></$tag>",
 		);
 		$expected = array(
-			'<q>Test<q>Test</q></q>',
-			'<div><div>Test</div></div>',
-			'<div>Test</div>',
+			"<$tag>Test<$tag>Test</$tag></$tag>",
+			"<$tag><$tag>Test</$tag></$tag>",
+			"<$tag>Test</$tag>",
 		);
 
 		foreach ( $inputs as $key => $input ) {
@@ -152,11 +121,7 @@
 		}
 	}
 
-	/**
-	 * @ticket 20401
-	 */
 	function test_allows_immediately_nested_object_tags() {
-
 		$object = '<object id="obj1"><param name="param1"/><object id="obj2"><param name="param2"/></object></object>';
 		$this->assertEquals( $object, balanceTags( $object, true ) );
 	}