t/cgi.t   | 12 ------------
 t/plack.t |  7 +++++--

diff --git a/t/cgi.t b/t/cgi.t
index 06519c3e6164e29bed022df425aebdf8fe21f266..382c21fc52e263da108eb6316498799b98f6d563 100644
--- a/t/cgi.t
+++ b/t/cgi.t
@@ -109,18 +109,6 @@ 	like($res->{head}, qr/Status:\s*206/i, "info/refs partial past end OK");
 	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;
diff --git a/t/plack.t b/t/plack.t
index 70cd20e53306ab5bdfec34ac2d99fc1bf3c91f45..1a719b41c6f2f7c4ffb73e03dacce3f8fcf93475 100644
--- a/t/plack.t
+++ b/t/plack.t
@@ -135,9 +135,12 @@ 	test_psgi($app, sub {
 		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 {