diff --git a/tests/examples/encoding/encoding.c b/tests/examples/encoding/encoding.c
index 86d7f8f126..4c4865c43c 100644
--- a/tests/examples/encoding/encoding.c
+++ b/tests/examples/encoding/encoding.c
@@ -395,8 +395,10 @@ main (int argc, char **argv)
   GstEncodingProfile *prof;
   gchar *inputuri;
 
+#if !GLIB_CHECK_VERSION (2, 31, 0)
   if (!g_thread_supported ())
     g_thread_init (NULL);
+#endif
 
   ctx = g_option_context_new ("- encode URIs with GstProfile and encodebin");
   g_option_context_add_main_entries (ctx, options, NULL);
diff --git a/tests/examples/overlay/gtk-xoverlay.c b/tests/examples/overlay/gtk-xoverlay.c
index c05685c7e2..3050bd703c 100644
--- a/tests/examples/overlay/gtk-xoverlay.c
+++ b/tests/examples/overlay/gtk-xoverlay.c
@@ -98,8 +98,10 @@ main (int argc, char **argv)
   gulong embed_xid;
   GstStateChangeReturn sret;
 
+#if !GLIB_CHECK_VERSION (2, 31, 0)
   if (!g_thread_supported ())
     g_thread_init (NULL);
+#endif
 
   gst_init (&argc, &argv);
   gtk_init (&argc, &argv);
diff --git a/tests/examples/overlay/qt-xoverlay.cpp b/tests/examples/overlay/qt-xoverlay.cpp
index aa483a71cd..cf8840fa95 100644
--- a/tests/examples/overlay/qt-xoverlay.cpp
+++ b/tests/examples/overlay/qt-xoverlay.cpp
@@ -80,8 +80,10 @@ find_video_sink (void)
 
 int main(int argc, char *argv[])
 {
+#if !GLIB_CHECK_VERSION (2, 31, 0)
   if (!g_thread_supported ())
     g_thread_init (NULL);
+#endif
 
   gst_init (&argc, &argv);
   QApplication app(argc, argv);
diff --git a/tests/examples/seek/jsseek.c b/tests/examples/seek/jsseek.c
index ab2bfc3950..fd16c548ed 100644
--- a/tests/examples/seek/jsseek.c
+++ b/tests/examples/seek/jsseek.c
@@ -2672,8 +2672,10 @@ main (int argc, char **argv)
   GOptionContext *ctx;
   GError *err = NULL;
 
+#if !GLIB_CHECK_VERSION (2, 31, 0)
   if (!g_thread_supported ())
     g_thread_init (NULL);
+#endif
 
   ctx = g_option_context_new ("- test seeking in gsteamer");
   g_option_context_add_main_entries (ctx, options, NULL);
diff --git a/tests/examples/seek/scrubby.c b/tests/examples/seek/scrubby.c
index c9a02f42bb..501d5599fd 100644
--- a/tests/examples/seek/scrubby.c
+++ b/tests/examples/seek/scrubby.c
@@ -463,8 +463,10 @@ main (int argc, char **argv)
   GOptionContext *ctx;
   GError *err = NULL;
 
+#if !GLIB_CHECK_VERSION (2, 31, 0)
   if (!g_thread_supported ())
     g_thread_init (NULL);
+#endif
 
   ctx = g_option_context_new ("seek");
   g_option_context_add_main_entries (ctx, options, NULL);
diff --git a/tests/examples/seek/seek.c b/tests/examples/seek/seek.c
index b04967b44b..60c09973e2 100644
--- a/tests/examples/seek/seek.c
+++ b/tests/examples/seek/seek.c
@@ -2675,8 +2675,10 @@ main (int argc, char **argv)
   GOptionContext *ctx;
   GError *err = NULL;
 
+#if !GLIB_CHECK_VERSION (2, 31, 0)
   if (!g_thread_supported ())
     g_thread_init (NULL);
+#endif
 
   ctx = g_option_context_new ("- test seeking in gsteamer");
   g_option_context_add_main_entries (ctx, options, NULL);
diff --git a/tests/icles/stress-playbin.c b/tests/icles/stress-playbin.c
index 3b90710336..30970ce0d7 100644
--- a/tests/icles/stress-playbin.c
+++ b/tests/icles/stress-playbin.c
@@ -100,8 +100,10 @@ main (int argc, char **argv)
   };
   GTimer *timer;
 
+#if !GLIB_CHECK_VERSION (2, 31, 0)
   if (!g_thread_supported ())
     g_thread_init (NULL);
+#endif
 
   ctx = g_option_context_new ("FILES OR DIRECTORIES WITH AUDIO FILES");
   g_option_context_add_main_entries (ctx, options, NULL);
diff --git a/tests/icles/test-colorkey.c b/tests/icles/test-colorkey.c
index ac04ba5c7d..9d88aec340 100644
--- a/tests/icles/test-colorkey.c
+++ b/tests/icles/test-colorkey.c
@@ -172,8 +172,10 @@ main (int argc, char **argv)
   GstPropertyProbe *probe;
   GValueArray *arr;
 
+#if !GLIB_CHECK_VERSION (2, 31, 0)
   if (!g_thread_supported ())
     g_thread_init (NULL);
+#endif
 
   gst_init (&argc, &argv);
   gtk_init (&argc, &argv);
diff --git a/tests/icles/test-xoverlay.c b/tests/icles/test-xoverlay.c
index 9ef552eeea..c1610b6601 100644
--- a/tests/icles/test-xoverlay.c
+++ b/tests/icles/test-xoverlay.c
@@ -144,8 +144,10 @@ main (gint argc, gchar ** argv)
   gulong embed_xid = 0;
   gboolean force_aspect = FALSE, draw_borders = FALSE;
 
+#if !GLIB_CHECK_VERSION (2, 31, 0)
   if (!g_thread_supported ())
     g_thread_init (NULL);
+#endif
 
   gst_init (&argc, &argv);
   gtk_init (&argc, &argv);
diff --git a/tools/gst-discoverer.c b/tools/gst-discoverer.c
index 210c1ed752..a3cd4f9df4 100644
--- a/tools/gst-discoverer.c
+++ b/tools/gst-discoverer.c
@@ -497,8 +497,10 @@ main (int argc, char **argv)
   };
   GOptionContext *ctx;
 
+#if !GLIB_CHECK_VERSION (2, 31, 0)
   if (!g_thread_supported ())
     g_thread_init (NULL);
+#endif
 
   ctx =
       g_option_context_new