Index: wp-testcase/test_shortcode.php
===================================================================
--- wp-testcase/test_shortcode.php	(revision 360)
+++ wp-testcase/test_shortcode.php	(working copy)
@@ -300,6 +300,28 @@
 		$this->assertEquals( $expected, $out );
 	}
 
+	function test_shortcode_unautop() {
+		// a blank line is added at the end, so test with it already there
+		$test_string = <<<EOF
+[footag]
+
+EOF;
+
+		$this->assertEquals( $test_string, shortcode_unautop( wpautop( $test_string ) ) );
+	}
+
+	function test_multiple_shortcode_unautop() {
+		// a blank line is added at the end, so test with it already there
+		$test_string = <<<EOF
+[footag]
+[footag]
+
+EOF;
+
+		$actual = shortcode_unautop( wpautop( $test_string ) );
+		$this->assertEquals( $test_string, $actual );
+	}
+
 }
 //http://core.trac.wordpress.org/ticket/10326
 class TestShortcodeStripping extends WPTestCase {