Index: tests/phpunit/includes/testcase-canonical.php
===================================================================
--- tests/phpunit/includes/testcase-canonical.php	(revision 47041)
+++ tests/phpunit/includes/testcase-canonical.php	(working copy)
@@ -217,6 +217,41 @@
 
 		$tag1                    = $factory->term->create( array( 'name' => 'post-formats' ) );
 		self::$term_ids[ $tag1 ] = 'post_tag';
+
+		$cat6                    = $factory->term->create(
+			array(
+				'taxonomy' => 'category',
+				'name'     => 'atom',
+			)
+		);
+		self::$term_ids[ $cat6 ] = 'category';
+
+		$tag2           = $factory->term->create(
+			array(
+				'taxonomy' => 'post_tag',
+				'name'     => 'feed',
+			)
+		);
+		self::$term_ids[ $tag2 ] = 'post_tag';
+
+		$tag3           = $factory->term->create(
+			array(
+				'taxonomy' => 'post_tag',
+				'name'     => 'rss',
+			)
+		);
+		self::$term_ids[ $tag3 ] = 'post_tag';
+
+		// Make sure there are 2 pages of posts in the cat6 and tag2,tag3 lists
+		for ( $i=1; $i <= 6; $i++ ) {
+			self::$post_ids[] = self::factory()->post->create_and_get(
+				array(
+					'post_date'     => '2020-01-01 12:00:00',
+					'post_category' => array( $cat6 ),
+					'tags_input'    => array( $tag2, $tag3 ),
+				)
+			);
+		}
 	}
 
 	/**
Index: tests/phpunit/tests/canonical.php
===================================================================
--- tests/phpunit/tests/canonical.php	(revision 47041)
+++ tests/phpunit/tests/canonical.php	(working copy)
@@ -126,6 +126,11 @@
 			),
 			//          array( '/2008/?category_name=cat-a', array( 'url' => '/2008/?category_name=cat-a', 'qv' => array('category_name' => 'cat-a', 'year' => '2008' ) ) ),
 
+			// Tags and categories with special names
+			array( '/tag/feed/page/2/', array( 'url' => '/tag/feed/page/2/', 'qv' => array( 'tag' => 'foo', 'paged' => '2' ) ), 46061 ),
+			array( '/tag/rss/page/2/', array( 'url' => '/tag/rss/page/2/', 'qv' => array( 'tag' => 'rss', 'paged' => '2' ) ), 46061 ),
+			array( '/category/atom/page/2/', array( 'url' => '/category/atom/page/2/', 'qv' => array( 'category_name' => 'feed', 'paged' => '2' ) ), 46061 ),
+
 							// Pages
 							array( '/child-page-1/', '/parent-page/child-page-1/' ),
 			array( '/?page_id=144', '/parent-page/child-page-1/' ),