diff --git a/tests/phpunit/tests/shortcode.php b/tests/phpunit/tests/shortcode.php
index c43313c61a..bde37f8df8 100644
--- a/tests/phpunit/tests/shortcode.php
+++ b/tests/phpunit/tests/shortcode.php
@@ -4,7 +4,7 @@
  */
 class Tests_Shortcode extends WP_UnitTestCase {
 
-	protected $shortcodes = array( 'test-shortcode-tag', 'footag', 'bartag', 'baztag', 'dumptag', 'hyphen', 'hyphen-foo', 'hyphen-foo-bar' );
+	protected $shortcodes = array( 'test-shortcode-tag', 'footag', 'bartag', 'baztag', 'dumptag', 'hyphen', 'hyphen-foo', 'hyphen-foo-bar', 'url' );
 
 	function setUp() {
 		parent::setUp();
@@ -73,6 +73,10 @@ class Tests_Shortcode extends WP_UnitTestCase {
 		return __FUNCTION__;
 	}
 
+	function _shortcode_url() {
+		return 'http://www.wordpress.org/';
+	}
+
 	function test_noatts() {
 		do_shortcode('[test-shortcode-tag /]');
 		$this->assertEquals( '', $this->atts );
@@ -454,6 +458,30 @@ EOF;
 				'[gallery]<div>Hello</div>[/gallery]',
 				'',
 			),
+			array(
+				'[url]',
+				'http://www.wordpress.org/',
+			),
+			array(
+				'<a href="[url]">',
+				'<a href="http://www.wordpress.org/">',
+			),
+			array(
+				'<a href=[url] >',
+				'<a href=http://www.wordpress.org/ >',
+			),
+			array(
+				'<a href="[url]plugins/">',
+				'<a href="http://www.wordpress.org/plugins/">',
+			),
+			array(
+				'<a href="bad[url]">',
+				'<a href="//www.wordpress.org/">',
+			),
+			array(
+				'<a onclick="bad[url]">',
+				'<a onclick="bad[url]">',
+			),
 		);
 	}