diff --git tests/phpunit/tests/canonical.php tests/phpunit/tests/canonical.php
index c06507b..e4043a4 100644
--- tests/phpunit/tests/canonical.php
+++ tests/phpunit/tests/canonical.php
@@ -100,6 +100,8 @@ class Tests_Canonical extends WP_Canonical_UnitTestCase {
 
 			// Comments
 			array( '/2008/03/03/comment-test/?cpage=2', '/2008/03/03/comment-test/comment-page-2/' ),
+			array( '/2008/03/03/comment-test/comment-page-20/', '/2008/03/03/comment-test/comment-page-3/', 20388 ), // there's only 3 pages
+			array( '/2008/03/03/comment-test/?cpage=30', '/2008/03/03/comment-test/comment-page-3/', 20388 ), // there's only 3 pages
 
 			// Attachments
 			array( '/?attachment_id=611', '/2008/06/10/post-format-test-gallery/canola2/' ),
