t/lei-import-maildir.t | 13 +++++++++----
 t/lei-q-thread.t       | 15 ++++++++-------

diff --git a/t/lei-import-maildir.t b/t/lei-import-maildir.t
index bd89677aa1fd7bb899f0b8fa84c7f18e8bdbc943..6706b0148317a32a02cf47a019ff5835c2e582a2 100644
--- a/t/lei-import-maildir.t
+++ b/t/lei-import-maildir.t
@@ -11,17 +11,20 @@ 	}
 	symlink(abs_path('t/data/0001.patch'), "$md/cur/x:2,S") or
 		BAIL_OUT "symlink $md $!";
 	lei_ok(qw(import), $md, \'import Maildir');
+	my $imp_err = $lei_err;
 	lei_ok(qw(q s:boolean));
 	my $res = json_utf8->decode($lei_out);
-	like($res->[0]->{'s'}, qr/use boolean/, 'got expected result');
+	like($res->[0]->{'s'}, qr/use boolean/, 'got expected result')
+			or diag explain($imp_err, $res);
 	is_deeply($res->[0]->{kw}, ['seen'], 'keyword set');
 	is($res->[1], undef, 'only got one result');
 
 	lei_ok(qw(import), $md, \'import Maildir again');
+	$imp_err = $lei_err;
 	lei_ok(qw(q -d none s:boolean), \'lei q w/o dedupe');
 	my $r2 = json_utf8->decode($lei_out);
-	is_deeply($r2, $res, 'idempotent import');
-
+	is_deeply($r2, $res, 'idempotent import')
+			or diag explain($imp_err, $res);
 	rename("$md/cur/x:2,S", "$md/cur/x:2,SR") or BAIL_OUT "rename: $!";
 	lei_ok('import', "maildir:$md", \'import Maildir after +answered');
 	lei_ok(qw(q -d none s:boolean), \'lei q after +answered');
@@ -33,8 +36,10 @@
 	symlink(abs_path('t/utf8.eml'), "$md/cur/u:2,ST") or
 		BAIL_OUT "symlink $md $!";
 	lei_ok('import', "maildir:$md", \'import Maildir w/ trashed message');
+	$imp_err = $lei_err;
 	lei_ok(qw(q -d none m:testmessage@example.com));
 	$res = json_utf8->decode($lei_out);
-	is_deeply($res, [ undef ], 'trashed message not imported');
+	is_deeply($res, [ undef ], 'trashed message not imported')
+			or diag explain($imp_err, $res);
 });
 done_testing;
diff --git a/t/lei-q-thread.t b/t/lei-q-thread.t
index c999d12bd1df2a7c78855269b1fd8a34597f94c2..26d06eec81e46c54e3eaf90df9ee219ea770150b 100644
--- a/t/lei-q-thread.t
+++ b/t/lei-q-thread.t
@@ -13,7 +13,8 @@ 	lei_ok([qw(import -F mboxrd -)], undef, { 0 => $buf, %$lei_opt });
 
 	lei_ok qw(q -t m:testmessage@example.com);
 	my $res = json_utf8->decode($lei_out);
-	is_deeply($res->[0]->{kw}, [ 'seen' ], 'q -t sets keywords');
+	is_deeply($res->[0]->{kw}, [ 'seen' ], 'q -t sets keywords') or
+		diag explain($res);
 
 	$eml = eml_load('t/utf8.eml');
 	$eml->header_set('References', $eml->header('Message-ID'));
@@ -28,9 +29,9 @@ 	is(scalar(@$res), 3, 'got 2 results');
 	pop @$res;
 	my %m = map { $_->{'m'} => $_ } @$res;
 	is_deeply($m{'testmessage@example.com'}->{kw}, ['seen'],
-		'flag set in direct hit');
-	'TODO' or is_deeply($m{'a-reply@miss'}->{kw}, ['draft'],
-		'flag set in thread hit');
+		'flag set in direct hit') or diag explain($res);
+	is_deeply($m{'a-reply@miss'}->{kw}, ['draft'],
+		'flag set in thread hit') or diag explain($res);
 
 	lei_ok qw(q -t -t m:testmessage@example.com);
 	$res = json_utf8->decode($lei_out);
@@ -38,9 +39,9 @@ 	is(scalar(@$res), 3, 'got 2 results with -t -t');
 	pop @$res;
 	%m = map { $_->{'m'} => $_ } @$res;
 	is_deeply($m{'testmessage@example.com'}->{kw}, ['flagged', 'seen'],
-		'flagged set in direct hit');
-	'TODO' or is_deeply($m{'testmessage@example.com'}->{kw}, ['draft'],
-		'flagged set in direct hit');
+		'flagged set in direct hit') or diag explain($res);
+	is_deeply($m{'a-reply@miss'}->{kw}, ['draft'],
+		'set in thread hit') or diag explain($res);
 	lei_ok qw(q -tt m:testmessage@example.com --only), "$ro_home/t2";
 	$res = json_utf8->decode($lei_out);
 	is_deeply($res->[0]->{kw}, [ qw(flagged seen) ],