diff --git a/glib/tests/Makefile.am b/glib/tests/Makefile.am
index 93b27d274..17cb69376 100644
--- a/glib/tests/Makefile.am
+++ b/glib/tests/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/glib-tap.mk
 
 LDADD = $(top_builddir)/glib/libglib-2.0.la -lm
 AM_CPPFLAGS = -g $(glib_INCLUDES) $(GLIB_DEBUG_FLAGS)
-DEFS = -DG_LOG_DOMAIN=\"GLib\" -DEXEEXT=\"$(EXEEXT)\"
+DEFS = -DG_LOG_DOMAIN=\"GLib\" -DEXEEXT=\"$(EXEEXT)\" -DG_CLEANUP_SCOPE=tests_cleanup
 AM_CFLAGS = $(GLIB_WARN_CFLAGS)
 
 # These tests corrupt the gcov bookkeeping, so we
diff --git a/glib/tests/private.c b/glib/tests/private.c
index d23259c12..8f4ca2e8e 100644
--- a/glib/tests/private.c
+++ b/glib/tests/private.c
@@ -370,6 +370,8 @@ test_static_private5 (void)
     g_thread_join (thread[i]);
 }
 
+G_CLEANUP_DEFINE
+
 int
 main (int argc, char *argv[])
 {
diff --git a/tests/Makefile.am b/tests/Makefile.am
index b6b3ebd70..45828cf10 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -4,7 +4,7 @@ SUBDIRS = gobject refcount
 
 LDADD = $(top_builddir)/glib/libglib-2.0.la
 AM_CPPFLAGS = $(gmodule_INCLUDES) $(GLIB_DEBUG_FLAGS)
-DEFS = -DGLIB_DISABLE_DEPRECATION_WARNINGS -DG_LOG_DOMAIN=\"GLib\"
+DEFS = -DGLIB_DISABLE_DEPRECATION_WARNINGS -DG_LOG_DOMAIN=\"GLib\" -DG_CLEANUP_SCOPE=tests_cleanup
 AM_CFLAGS = -g
 
 # Some random programs that appear not to be testcases and not used from any testcases