5 files changed, 12 insertions, 7 deletions
diff --git a/lib/message/mu-contact.cc b/lib/message/mu-contact.cc
index db77df4..711f4d2 100644
--- a/lib/message/mu-contact.cc
+++ b/lib/message/mu-contact.cc
@@ -80,7 +80,7 @@ Mu::lowercase_hash(const std::string& s)
  *
  */
 
-#include "utils/mu-utils.hh"
+#include "utils/mu-test-utils.hh"
 
 static void
 test_ctor_foo()
@@ -189,14 +189,13 @@ static void
 test_misc()
 {
 	g_assert_false(!!contact_type_from_field_id(Field::Id::Subject));
-
 }
 
 
 int
 main(int argc, char* argv[])
 {
-	g_test_init(&argc, &argv, NULL);
+	mu_test_init(&argc, &argv);
 	g_mime_init();
 
 	g_test_add_func("/message/contact/ctor-foo", test_ctor_foo);
diff --git a/lib/message/mu-document.cc b/lib/message/mu-document.cc
index c0a207e..f0c230c 100644
--- a/lib/message/mu-document.cc
+++ b/lib/message/mu-document.cc
@@ -370,6 +370,8 @@ Document::remove(Field::Id field_id)
 
 #ifdef BUILD_TESTS
 
+#include "utils/mu-test-utils.hh"
+
 #define assert_same_contact(C1,C2) do {				\
 	g_assert_cmpstr(C1.email.c_str(),==,C2.email.c_str());	\
 	g_assert_cmpstr(C2.name.c_str(),==,C2.name.c_str());	\
diff --git a/lib/message/mu-fields.cc b/lib/message/mu-fields.cc
index d114a1c..aec8c7a 100644
--- a/lib/message/mu-fields.cc
+++ b/lib/message/mu-fields.cc
@@ -20,6 +20,8 @@
 #include "mu-fields.hh"
 #include "mu-flags.hh"
 
+#include "utils/mu-test-utils.hh"
+
 using namespace Mu;
 
 std::string
@@ -184,7 +186,7 @@ test_xapian_term()
 int
 main(int argc, char* argv[])
 {
-	g_test_init(&argc, &argv, NULL);
+	mu_test_init(&argc, &argv);
 
 	g_test_add_func("/message/fields/ids", test_ids);
 	g_test_add_func("/message/fields/shortcuts", test_shortcuts);
diff --git a/lib/message/mu-message-file.cc b/lib/message/mu-message-file.cc
index 6067f62..3c86c24 100644
--- a/lib/message/mu-message-file.cc
+++ b/lib/message/mu-message-file.cc
@@ -122,6 +122,8 @@ Mu::flags_from_path(const std::string& path)
 
 #ifdef BUILD_TESTS
 
+#include "utils/mu-test-utils.hh"
+
 static void
 test_maildir_from_path()
 {
@@ -192,7 +194,7 @@ test_flags_from_path()
 int
 main(int argc, char* argv[])
 {
-	g_test_init(&argc, &argv, NULL);
+	mu_test_init(&argc, &argv);
 
 	g_test_add_func("/message/file/maildir-from-path",
 			test_maildir_from_path);
diff --git a/lib/message/test-mu-message.cc b/lib/message/test-mu-message.cc
index 5311e86..8d85fae 100644
--- a/lib/message/test-mu-message.cc
+++ b/lib/message/test-mu-message.cc
@@ -16,7 +16,7 @@
 ** Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 **
 */
-
+#include "utils/mu-test-utils.hh"
 #include "mu-message.hh"
 #include "mu-mime-object.hh"
 #include <glib.h>
@@ -834,7 +834,7 @@ test_message_sanitize_maildir()
 int
 main(int argc, char* argv[])
 {
-	g_test_init(&argc, &argv, NULL);
+	mu_test_init(&argc, &argv);
 
 	g_test_add_func("/message/message/mailing-list",
 			test_message_mailing_list);