diff --git a/lib/tests/testdir2/bar/cur/mail1 b/lib/tests/testdir2/bar/cur/mail1
index b5bb3075..56808c6d 100644
--- a/lib/tests/testdir2/bar/cur/mail1
+++ b/lib/tests/testdir2/bar/cur/mail1
@@ -4,7 +4,8 @@ Subject: Fere libenter homines id quod volunt credunt
 To: "Julius Caesar" <jc@example.com>
 Message-id: <3BE9E6535E3029448670913581E7A1A20D852173@emss35m06.us.lmco.com>
 MIME-version: 1.0
-x-label: Paradise, losT
+x-label: Paradise losT
+X-Keywords: milton,john
 Content-type: text/plain; charset=us-ascii
 Content-transfer-encoding: 7BIT
 Precedence: high
diff --git a/lib/tests/testdir2/bar/cur/mail6 b/lib/tests/testdir2/bar/cur/mail6
index 1d5c1d74..c9b799b5 100644
--- a/lib/tests/testdir2/bar/cur/mail6
+++ b/lib/tests/testdir2/bar/cur/mail6
@@ -4,7 +4,7 @@ Subject: eyes of a stranger
 To: "Enrico Fermi" <enrico@example.com>
 Message-id: <3BE9E6535E302944823E7A1A20D852173@msg.id>
 MIME-version: 1.0
-X-label: @NextActions, operation:mindcrime, Queensrÿche
+X-label: @NextActions operation:mindcrime Queensrÿche
 Content-type: text/plain; charset=us-ascii
 Content-transfer-encoding: 7BIT
 Precedence: high
diff --git a/mu/tests/test-mu-query.c b/mu/tests/test-mu-query.c
index 00996841..df356bd0 100644
--- a/mu/tests/test-mu-query.c
+++ b/mu/tests/test-mu-query.c
@@ -492,7 +492,8 @@ test_mu_query_tags (void)
 	};
 
  	for (i = 0; i != G_N_ELEMENTS(queries); ++i)
-		g_assert_cmpuint (run_and_count_matches (DB_PATH2, queries[i].query),
+		g_assert_cmpuint (run_and_count_matches (DB_PATH2,
+							 queries[i].query),
 				  ==, queries[i].count);
 }
 
@@ -507,7 +508,8 @@ test_mu_query_signed_encrypted (void)
 	};
 
  	for (i = 0; i != G_N_ELEMENTS(queries); ++i)
-		g_assert_cmpuint (run_and_count_matches (DB_PATH1, queries[i].query),
+		g_assert_cmpuint (run_and_count_matches (DB_PATH1,
+							 queries[i].query),
 				  ==, queries[i].count);
 }