is($res->{body}, substr($orig, 5), 'partial body OK past end');
 }
 
-# atom feeds
-{
-       local $ENV{HOME} = $home;
-       my $res = cgi_run("/test/atom.xml");
-       like($res->{body}, qr/<title>test for public-inbox/,
-               "set title in XML feed");
-       like($res->{body},
-               qr!http://test\.example\.com/test/blah\@example\.com/!,
-               "link id set");
-       like($res->{body}, qr/what\?/, "reply included");
-}
-
 # message-id pages
 {
        local $ENV{HOME} = $home;
 
                my ($cb) = @_;
                my $res = $cb->(GET($pfx . '/atom.xml'));
                is(200, $res->code, 'success response received for atom');
-               like($res->content,
-                       qr!link\s+href="\Q$pfx\E/blah\@example\.com/"!s,
+               my $body = $res->content;
+               like($body, qr!link\s+href="\Q$pfx\E/blah\@example\.com/"!s,
                        'atom feed generated correct URL');
+               like($body, qr/<title>test for public-inbox/,
+                       "set title in XML feed");
+               like($body, qr/zzzzzz/, 'body included');
        });
 
        test_psgi($app, sub {