diff --git a/glib/tests/meson.build b/glib/tests/meson.build
index 073d47c7c..480053288 100644
--- a/glib/tests/meson.build
+++ b/glib/tests/meson.build
@@ -91,6 +91,7 @@ glib_tests = {
   'testing' : {},
   'test-printf' : {},
   'thread' : {},
+  'thread-pool' : {},
   'timeout' : {},
   'timer' : {},
   'tree' : {},
diff --git a/glib/tests/thread-pool.c b/glib/tests/thread-pool.c
new file mode 100644
index 000000000..703da5d7a
--- /dev/null
+++ b/glib/tests/thread-pool.c
@@ -0,0 +1,156 @@
+/* Unit tests for GThreadPool
+ * Copyright (C) 2020 Sebastian Dröge <sebastian@centricular.com>
+ *
+ * This work is provided "as is"; redistribution and modification
+ * in whole or in part, in any medium, physical or electronic is
+ * permitted without restriction.
+ *
+ * This work is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * In no event shall the authors or contributors be liable for any
+ * direct, indirect, incidental, special, exemplary, or consequential
+ * damages (including, but not limited to, procurement of substitute
+ * goods or services; loss of use, data, or profits; or business
+ * interruption) however caused and on any theory of liability, whether
+ * in contract, strict liability, or tort (including negligence or
+ * otherwise) arising in any way out of the use of this software, even
+ * if advised of the possibility of such damage.
+ */
+
+#include <config.h>
+
+#include <glib.h>
+
+typedef struct {
+  GMutex mutex;
+  GCond cond;
+  gboolean signalled;
+} MutexCond;
+
+static void
+pool_func (gpointer data, gpointer user_data)
+{
+  MutexCond *m = user_data;
+
+  g_mutex_lock (&m->mutex);
+  g_assert_false (m->signalled);
+  g_assert_true (data == GUINT_TO_POINTER (123));
+  m->signalled = TRUE;
+  g_cond_signal (&m->cond);
+  g_mutex_unlock (&m->mutex);
+}
+
+static void
+test_simple (gconstpointer shared)
+{
+  GThreadPool *pool;
+  GError *err = NULL;
+  MutexCond m;
+  gboolean success;
+
+  g_mutex_init (&m.mutex);
+  g_cond_init (&m.cond);
+
+  if (GPOINTER_TO_INT (shared))
+    {
+      g_test_summary ("Tests that a shared, non-exclusive thread pool "
+                      "generally works.");
+      pool = g_thread_pool_new (pool_func, &m, -1, FALSE, &err);
+    }
+  else
+    {
+      g_test_summary ("Tests that an exclusive thread pool generally works.");
+      pool = g_thread_pool_new (pool_func, &m, 2, TRUE, &err);
+    }
+  g_assert_no_error (err);
+  g_assert_nonnull (pool);
+
+  g_mutex_lock (&m.mutex);
+  m.signalled = FALSE;
+
+  success = g_thread_pool_push (pool, GUINT_TO_POINTER (123), &err);
+  g_assert_no_error (err);
+  g_assert_true (success);
+
+  while (!m.signalled)
+    g_cond_wait (&m.cond, &m.mutex);
+  g_mutex_unlock (&m.mutex);
+
+  g_thread_pool_free (pool, TRUE, TRUE);
+}
+
+static void
+dummy_pool_func (gpointer data, gpointer user_data)
+{
+  g_assert_true (data == GUINT_TO_POINTER (123));
+}
+
+static void
+test_create_first_pool (gconstpointer shared_first)
+{
+  GThreadPool *pool;
+  GError *err = NULL;
+  gboolean success;
+
+  g_test_bug ("https://gitlab.gnome.org/GNOME/glib/issues/2012");
+  if (GPOINTER_TO_INT (shared_first))
+    {
+      g_test_summary ("Tests that creating an exclusive pool after a "
+                      "shared one works.");
+    }
+  else
+    {
+      g_test_summary ("Tests that creating a shared pool after an "
+                      "exclusive one works.");
+    }
+
+  if (!g_test_subprocess ())
+    {
+      g_test_trap_subprocess (NULL, 0, 0);
+      g_test_trap_assert_passed ();
+      return;
+    }
+
+  g_thread_pool_set_max_unused_threads (0);
+
+  if (GPOINTER_TO_INT (shared_first))
+    pool = g_thread_pool_new (dummy_pool_func, NULL, -1, FALSE, &err);
+  else
+    pool = g_thread_pool_new (dummy_pool_func, NULL, 2, TRUE, &err);
+  g_assert_no_error (err);
+  g_assert_nonnull (pool);
+
+  success = g_thread_pool_push (pool, GUINT_TO_POINTER (123), &err);
+  g_assert_no_error (err);
+  g_assert_true (success);
+
+  g_thread_pool_free (pool, TRUE, TRUE);
+
+  if (GPOINTER_TO_INT (shared_first))
+    pool = g_thread_pool_new (dummy_pool_func, NULL, 2, TRUE, &err);
+  else
+    pool = g_thread_pool_new (dummy_pool_func, NULL, -1, FALSE, &err);
+  g_assert_no_error (err);
+  g_assert_nonnull (pool);
+
+  success = g_thread_pool_push (pool, GUINT_TO_POINTER (123), &err);
+  g_assert_no_error (err);
+  g_assert_true (success);
+
+  g_thread_pool_free (pool, TRUE, TRUE);
+}
+
+int
+main (int argc, char *argv[])
+{
+  g_test_init (&argc, &argv, NULL);
+
+  g_test_add_data_func ("/thread_pool/shared", GINT_TO_POINTER (TRUE), test_simple);
+  g_test_add_data_func ("/thread_pool/exclusive", GINT_TO_POINTER (FALSE), test_simple);
+  g_test_add_data_func ("/thread_pool/create_shared_after_exclusive", GINT_TO_POINTER (FALSE), test_create_first_pool);
+  g_test_add_data_func ("/thread_pool/create_exclusive_after_shared", GINT_TO_POINTER (TRUE), test_create_first_pool);
+
+  return g_test_run ();
+}