diff --git a/lib/tests/test-mu-msg.cc b/lib/tests/test-mu-msg.cc
index abf16fff..e1d06115 100644
--- a/lib/tests/test-mu-msg.cc
+++ b/lib/tests/test-mu-msg.cc
@@ -277,6 +277,18 @@ test_mu_msg_tags()
 	assert_equal_seq_str(msg.tags(), expected_tags);
 }
 
+static void
+test_mu_msg_tags_keyword()
+{
+	g_test_bug("2933");
+
+	const auto msg{Message::make_from_path(MU_TESTMAILDIR4 "/181736.eml").value()};
+	const auto expected = std::to_array<std::string>({"aap", "noot", "mies"});
+
+	assert_equal_seq_str(msg.tags(), expected);
+}
+
+
 static void
 test_mu_msg_comp_unix_programmer()
 {
@@ -380,6 +392,8 @@ main(int argc, char* argv[])
 	g_test_add_func("/msg/mu-msg-flags", test_mu_msg_flags);
 
 	g_test_add_func("/msg/mu-msg-tags", test_mu_msg_tags);
+	g_test_add_func("/msg/mu-msg-tags-keyword", test_mu_msg_tags_keyword);
+
 	g_test_add_func("/msg/mu-msg-references", test_mu_msg_references);
 	g_test_add_func("/msg/mu-msg-references_dups", test_mu_msg_references_dups);
 	g_test_add_func("/msg/mu-msg-references_many", test_mu_msg_references_many);
diff --git a/testdata/testdir4/181736.eml b/testdata/testdir4/181736.eml
index 56255c45..42c7f136 100644
--- a/testdata/testdir4/181736.eml
+++ b/testdata/testdir4/181736.eml
@@ -10,6 +10,7 @@ Organization: UseNetServer - www.usenetserver.com
 X-Complaints-To: abuse@usenetserver.com
 Message-ID: <oktdp.42997$Te.22361@news.usenetserver.com>
 Date: 08 Mar 2011 17:04:20 GMT
+Keywords: aap, noot,mies
 Lines: 27
 Xref: uutiset.elisa.fi comp.unix.programmer:181736