Index: tests/phpunit/tests/canonical.php
===================================================================
--- tests/phpunit/tests/canonical.php	(revision 25397)
+++ tests/phpunit/tests/canonical.php	(working copy)
@@ -76,6 +76,8 @@
 		$this->factory->term->create( array( 'taxonomy' => 'category', 'name' => 'cat-b' ) );
 
 		$this->factory->term->create( array( 'name' => 'post-formats' ) );
+
+		$this->factory->term->create( array( 'taxonomy' => 'tag', 'name' => 'rss' ) );
 	}
 
 	function tearDown() {
@@ -181,6 +183,14 @@
 			array( '/category/uncategorized/?tag=post-formats', array( 'url' => '/category/uncategorized/?tag=post-formats', 'qv' => array('category_name' => 'uncategorized', 'tag' => 'post-formats') ) ),
 			array( '/?category_name=cat-a,cat-b', array( 'url' => '/?category_name=cat-a,cat-b', 'qv' => array( 'category_name' => 'cat-a,cat-b' ) ) ),
 
+			// Tags with the same name as a feed should work
+			array( '/tag/rss/feed/', '/tag/rss/feed/', 21700 ),
+			array( '/tag/rss/feed', '/tag/rss/feed/', 21700 ),
+			array( '/tag/rss/feed/atom/', '/tag/rss/feed/atom/', 21700 ),
+			array( '/tag/rss/feed/atom', '/tag/rss/feed/atom/', 21700 ),
+			array( '/tag/rss/page/2/', '/tag/rss/page/2/', 21700 ),
+			array( '/tag/rss/page/2', '/tag/rss/page/2/', 21700 ),
+
 			// Taxonomies with extra Query Vars
 			array( '/category/cat-a/page/1/?test=one%20two', '/category/cat-a/?test=one%20two', 18086), // Extra query vars should stay encoded