diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index ad7cff60..9ace783b 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -139,9 +139,9 @@ EXTRA_DIST=							\
 	testdir2/Foo/cur/arto.eml				\
 	testdir2/Foo/tmp/.noindex				\
 	testdir2/Foo/new/.noindex				\
-	testdir2/wom bat/cur/atomic				\
-	testdir2/wom bat/cur/rfc822.1				\
-	testdir2/wom bat/cur/rfc822.2				\
+	testdir2/wom_bat/cur/atomic				\
+	testdir2/wom_bat/cur/rfc822.1				\
+	testdir2/wom_bat/cur/rfc822.2				\
 	testdir3/tree						\
 	testdir3/tree/new					\
 	testdir3/tree/new/.noindex				\
diff --git a/src/tests/test-mu-cmd.c b/src/tests/test-mu-cmd.c
index 4f4af95d..56d544fd 100644
--- a/src/tests/test-mu-cmd.c
+++ b/src/tests/test-mu-cmd.c
@@ -194,11 +194,14 @@ test_mu_find_mime (void)
 static void
 test_mu_find_text_in_rfc822 (void)
 {
-
+	search ("embed:dancing", 1);
+	search ("e:curious", 1);
+	search ("embed:with", 2);
+	search ("e:karjala", 0);
+	search ("embed:navigation", 1);
 }
 
 
-
 /* some more tests */
 static void
 test_mu_find_03 (void)
@@ -687,7 +690,9 @@ main (int argc, char *argv[])
 	g_test_add_func ("/mu-cmd/test-mu-find-02", test_mu_find_02);
 
 	g_test_add_func ("/mu-cmd/test-mu-find-file", test_mu_find_file);
+
 	g_test_add_func ("/mu-cmd/test-mu-find-mime", test_mu_find_mime);
+
 	g_test_add_func ("/mu-cmd/test-mu-find-text-in-rfc822",
 			 test_mu_find_text_in_rfc822);
 
diff --git a/src/tests/testdir2/wom bat/cur/atomic b/src/tests/testdir2/wom_bat/cur/atomic
similarity index 100%
rename from src/tests/testdir2/wom bat/cur/atomic
rename to src/tests/testdir2/wom_bat/cur/atomic
diff --git a/src/tests/testdir2/wom bat/cur/rfc822.1 b/src/tests/testdir2/wom_bat/cur/rfc822.1
similarity index 100%
rename from src/tests/testdir2/wom bat/cur/rfc822.1
rename to src/tests/testdir2/wom_bat/cur/rfc822.1
diff --git a/src/tests/testdir2/wom bat/cur/rfc822.2 b/src/tests/testdir2/wom_bat/cur/rfc822.2
similarity index 100%
rename from src/tests/testdir2/wom bat/cur/rfc822.2
rename to src/tests/testdir2/wom_bat/cur/rfc822.2