diff --git a/gio/ChangeLog b/gio/ChangeLog
index 482e41d8d..6fe7412aa 100644
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-26  Matthias Clasen  <mclasen@redhat.com>
+
+	* tests/*: Make tests work 
+
 2008-05-26  Matthias Clasen  <mclasen@redhat.com>
 
 	* gio.symbols: Add g_memory_output_stream_get_data_size.
diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
index 6f3c65025..8f2bb83f6 100644
--- a/gio/tests/Makefile.am
+++ b/gio/tests/Makefile.am
@@ -12,6 +12,7 @@ INCLUDES = 			\
 noinst_PROGRAMS = $(TEST_PROGS)
 progs_ldadd     = 					\
 	$(top_builddir)/glib/libglib-2.0.la 		\
+	$(top_builddir)/gthread/libgthread-2.0.la	\
 	$(top_builddir)/gobject/libgobject-2.0.la	\
 	$(top_builddir)/gio/libgio-2.0.la
 
diff --git a/gio/tests/data-input-stream.c b/gio/tests/data-input-stream.c
index 6abc7c471..b979066ac 100644
--- a/gio/tests/data-input-stream.c
+++ b/gio/tests/data-input-stream.c
@@ -318,6 +318,7 @@ main (int   argc,
       char *argv[])
 {
   g_type_init ();
+  g_thread_init (0);
   g_test_init (&argc, &argv, NULL);
 
   g_test_add_func ("/data-input-stream/read-lines-LF", test_read_lines_LF);
diff --git a/gio/tests/data-output-stream.c b/gio/tests/data-output-stream.c
index 1a7e1ae84..56edbfdd7 100644
--- a/gio/tests/data-output-stream.c
+++ b/gio/tests/data-output-stream.c
@@ -282,6 +282,7 @@ main (int   argc,
       char *argv[])
 {
   g_type_init ();
+  g_thread_init (0);
   g_test_init (&argc, &argv, NULL);
 
   g_test_add_func ("/data-input-stream/read-lines-LF", test_read_lines_LF);
diff --git a/gio/tests/g-file-info.c b/gio/tests/g-file-info.c
index d3ed5c98e..edbd31934 100644
--- a/gio/tests/g-file-info.c
+++ b/gio/tests/g-file-info.c
@@ -117,6 +117,7 @@ main (int   argc,
       char *argv[])
 {
   g_type_init ();
+  g_thread_init (0);
   g_test_init (&argc, &argv, NULL);
 
   g_test_add_func ("/g-file-info/test_g_file_info", test_g_file_info);
diff --git a/gio/tests/g-file.c b/gio/tests/g-file.c
index d512c9306..26186313e 100644
--- a/gio/tests/g-file.c
+++ b/gio/tests/g-file.c
@@ -507,6 +507,7 @@ main (int   argc,
       char *argv[])
 {
   g_type_init ();
+  g_thread_init (0);
   g_test_init (&argc, &argv, NULL);
   
   
diff --git a/gio/tests/live-g-file.c b/gio/tests/live-g-file.c
index 203fcb27d..a5ece7f8a 100644
--- a/gio/tests/live-g-file.c
+++ b/gio/tests/live-g-file.c
@@ -1107,6 +1107,7 @@ main (int argc, char *argv[])
 
   /*  strip all gtester-specific args  */
   g_type_init ();
+  g_thread_init (0);
   g_test_init (&argc, &argv, NULL);
 
   /*  no extra parameters specified, assume we're executed from glib test suite  */ 
diff --git a/gio/tests/memory-input-stream.c b/gio/tests/memory-input-stream.c
index 247613c6d..de3f661c5 100644
--- a/gio/tests/memory-input-stream.c
+++ b/gio/tests/memory-input-stream.c
@@ -70,6 +70,7 @@ main (int   argc,
       char *argv[])
 {
   g_type_init ();
+  g_thread_init (0);
   g_test_init (&argc, &argv, NULL);
 
   g_test_add_func ("/memory-input-stream/read-chunks", test_read_chunks);