lib/PublicInbox/Search.pm |  1 -
 t/search.t                | 14 +++++++-------

diff --git a/lib/PublicInbox/Search.pm b/lib/PublicInbox/Search.pm
index aec459b3a5ce50ccb4c3c399f76496bddd45f871..3b25b6625005d646dcd422ba444bfc1ae6295947 100644
--- a/lib/PublicInbox/Search.pm
+++ b/lib/PublicInbox/Search.pm
@@ -58,7 +58,6 @@ 	mid => 'Q', # uniQue id (Message-ID)
 );
 
 my %prob_prefix = (
-	subject => 'S',
 	s => 'S', # for mairix compatibility
 	m => 'Q', # 'mid' is exact, 'm' can do partial
 	f => 'A', # for mairix compatibility
diff --git a/t/search.t b/t/search.t
index bb0861a10acd46c71d1eeb021bc599068991db99..7abaf8321530c90c054ce58c1d687036ff4b31c2 100644
--- a/t/search.t
+++ b/t/search.t
@@ -123,19 +123,19 @@ 		$res = $ro->query("path:$p");
 		is($res->{total}, 0, "path variant `$p' does not match");
 	}
 
-	$res = $ro->query('subject:(Hello world)');
+	$res = $ro->query('s:(Hello world)');
 	@res = filter_mids($res);
-	is_deeply(\@res, \@exp, 'got expected results for subject:() match');
+	is_deeply(\@res, \@exp, 'got expected results for s:() match');
 
-	$res = $ro->query('subject:"Hello world"');
+	$res = $ro->query('s:"Hello world"');
 	@res = filter_mids($res);
-	is_deeply(\@res, \@exp, 'got expected results for subject:"" match');
+	is_deeply(\@res, \@exp, 'got expected results for s:"" match');
 
-	$res = $ro->query('subject:"Hello world"', {limit => 1});
+	$res = $ro->query('s:"Hello world"', {limit => 1});
 	is(scalar @{$res->{msgs}}, 1, "limit works");
 	my $first = $res->{msgs}->[0];
 
-	$res = $ro->query('subject:"Hello world"', {offset => 1});
+	$res = $ro->query('s:"Hello world"', {offset => 1});
 	is(scalar @{$res->{msgs}}, 1, "offset works");
 	my $second = $res->{msgs}->[0];
 
@@ -181,7 +181,7 @@ {
 	$rw_commit->();
 	$ro->reopen;
 
-	# Subject:
+	# subject
 	my $res = $ro->query('ghost');
 	my @exp = sort qw(ghost-message@s ghost-reply@s);
 	my @res = filter_mids($res);