diff --git a/cts/valgrind-pcmk.suppressions b/cts/valgrind-pcmk.suppressions
index 461edc250b..a470d7598c 100644
--- a/cts/valgrind-pcmk.suppressions
+++ b/cts/valgrind-pcmk.suppressions
@@ -1,295 +1,351 @@
 # Valgrind suppressions for Pacemaker testing
 {
    Valgrind bug
    Memcheck:Addr8
    fun:__strspn_sse42
    fun:crm_get_msec
 }
 
 {
    dlopen internals
    Memcheck:Leak
    fun:calloc
    fun:_dlerror_run
    fun:dlopen*
    fun:_log_so_walk_callback
    fun:dl_iterate_phdr
    fun:qb_log_init
 }
 
 # Numerous leaks in bash
 
 {
    Bash reader_loop leaks
    Memcheck:Leak
    fun:malloc
    fun:xmalloc
    ...
    fun:reader_loop
    fun:main
 }
 
 {
    Bash set_default_locale leaks
    Memcheck:Leak
    fun:malloc
    fun:xmalloc
    fun:set_default_locale
    fun:main
 }
 
 {
    Bash execute_command leaks
    Memcheck:Leak
    fun:malloc
    fun:xmalloc
    obj:*/bash
    ...
    fun:execute_command_internal
    fun:execute_command
    ...
 }
 
 # Numerous leaks in glib
 
 {
    quarks - hashtable
    Memcheck:Leak
    fun:calloc
    fun:g_malloc0
    obj:*/libglib-*
    fun:g_slice_alloc
    fun:g_hash_table_new_full
    fun:g_quark_from_static_string
 }
 
 {
    quarks - hashtable 2
    Memcheck:Leak
    fun:malloc
    fun:g_malloc
    fun:g_slice_alloc
    fun:g_hash_table_new_full
    fun:g_quark_from_static_string
 }
 
 {
    quarks - hashtable 3
    Memcheck:Leak
    fun:calloc
    fun:g_malloc0
    fun:g_hash_table_new_full
    fun:g_quark_from_static_string
 }
 
 {
    quarks - hashtable 4
    Memcheck:Leak
    fun:malloc
    fun:realloc
    fun:g_realloc
    fun:g_quark_from_static_string
 }
 
 {
-   glib mainloop internals - default
+   glib - mainloop new calloc
    Memcheck:Leak
    fun:calloc
    fun:g_malloc0
    fun:g_main_context_new
    fun:g_main_context_default
    fun:g_main_loop_new
+   ...
    fun:main
 }
 
 {
-   glib mainloop internals - default
+   glib - mainloop new malloc
    Memcheck:Leak
    fun:malloc
    fun:g_malloc
-   fun:g_slice_alloc
-   fun:*
+   ...
    fun:g_main_context_new
    fun:g_main_context_default
    fun:g_main_loop_new
+   ...
    fun:main
 }
 
 {
-   glib mainloop internals - default
+   glib - mainloop new calloc 2
    Memcheck:Leak
    fun:calloc
    fun:g_malloc0
    obj:*/libglib-2.*
    fun:g_slice_alloc
    fun:g_ptr_array_sized_new
    fun:g_main_context_new
    fun:g_main_context_default
    fun:g_main_loop_new
 }
 
 {
-   glib mainloop internals - run
+   glib - mainloop run calloc
    Memcheck:Leak
    fun:calloc
    fun:g_malloc0
    fun:g_thread_self
    fun:g_main_loop_run
 }
 
 {
-   glib mainloop internals - run
+   glib - mainloop run malloc
    Memcheck:Leak
    fun:malloc
    fun:g_malloc
    obj:*/libglib-2.*
    fun:g_main_loop_run
 }
 
 {
-   glib mainloop internals - run
+   glib - mainloop run malloc 2
    Memcheck:Leak
    fun:malloc
    fun:realloc
    fun:g_realloc
    obj:*/libglib-2.*
    fun:g_ptr_array_add
    fun:g_main_context_check
    obj:*/libglib-2.*
    fun:g_main_loop_run
 }
 
 {
-   glib mainloop internals - run
+   glib - mainloop run malloc 3
    Memcheck:Leak
    fun:malloc
-   fun:g_malloc
-   fun:g_slice_alloc
-   fun:g_slice_alloc0
+   fun:realloc
+   fun:g_realloc
+   obj:*/libglib-2.*
+   fun:g_array_set_size
+   fun:g_static_private_set
    obj:*/libglib-2.*
    fun:g_main_context_dispatch
    obj:*/libglib-2.*
    fun:g_main_loop_run
 }
 
 {
-   glib mainloop internals - run
+   glib - mainloop run malloc 4
+   Memcheck:Leak
+   fun:malloc
+   obj:*/libglib-2.*
+   fun:g_private_get
+   fun:g_thread_self
+   fun:g_main_loop_run
+}
+
+{
+   glib - mainloop run malloc 5
    Memcheck:Leak
    fun:malloc
    fun:realloc
-   fun:g_realloc
    obj:*/libglib-2.*
-   fun:g_array_set_size
-   fun:g_static_private_set
+   fun:g_private_get
+   fun:g_thread_self
+   fun:g_main_loop_run
+}
+
+{
+   glib - mainloop run malloc 6
+   Memcheck:Leak
+   fun:malloc
    obj:*/libglib-2.*
+   fun:g_private_get
    fun:g_main_context_dispatch
    obj:*/libglib-2.*
    fun:g_main_loop_run
 }
 
 {
-   glib mainloop internals - run
+   glib - mainloop run malloc 7
    Memcheck:Leak
    fun:malloc
    fun:g_malloc
    fun:g_slice_alloc
    fun:g_array_sized_new
    fun:g_static_private_set
    obj:*/libglib-2.*
    fun:g_main_context_dispatch
    obj:*/libglib-2.*
    fun:g_main_loop_run
 }
 
 {
-   glib types
+   glib - mainloop run malloc 8
    Memcheck:Leak
+   match-leak-kinds: reachable
    fun:malloc
    fun:realloc
    fun:g_realloc
    obj:*/libgobject-*
    fun:g_type_register_static
 }
 
 {
-   glib types 2
+   glib - register malloc
    Memcheck:Leak
+   fun:malloc
    fun:realloc
    fun:g_realloc
    obj:*/libgobject-*
    fun:g_type_register_static
-   fun:g_param_type_register_static
 }
 
 {
-   glib types 3
+   glib - register realloc
    Memcheck:Leak
-   fun:calloc
-   fun:g_malloc0
+   fun:realloc
+   fun:g_realloc
    obj:*/libgobject-*
-   fun:g_type_register_fundamental
+   fun:g_type_register_static
+   fun:g_param_type_register_static
 }
 
 {
-   glib types 4
+   glib - types register calloc
    Memcheck:Leak
    fun:calloc
    fun:g_malloc0
-   obj:*/libgobject-*
+   ...
    obj:*/libgobject-*
    fun:g_type_register_fundamental
 }
 
 {
-   glib - the return
+   glib - init calloc
    Memcheck:Leak
    fun:calloc
    fun:g_malloc0
-   obj:*/libgobject-*
+   ...
    obj:*/libgobject-*
    fun:_dl_init
 }
 
 {
-   glib - seriously?
+   glib - init calloc 2
    Memcheck:Leak
    fun:calloc
    fun:g_malloc0
+   ...
    obj:*/libgobject-*
-   obj:*/libgobject-*
-   obj:*/libgobject-*
+   fun:call_init*
    fun:_dl_init
 }
 
 {
-   glib - this is not funny anymore
+   glib - register malloc 2
    Memcheck:Leak
    fun:malloc
    fun:realloc
    fun:g_realloc
    obj:*/libgobject-*
    fun:g_type_register_fundamental
 }
 
 {
-   glib - why do you hate me?
+   glib - hashtable new calloc
    Memcheck:Leak
+   match-leak-kinds: reachable
    fun:calloc
    fun:g_malloc0
-   obj:*/libgobject-*
-   obj:*/libgobject-*
-   fun:call_init.part.0
+   ...
+   fun:g_hash_table_new_full
+   ...
+   obj:*/libglib-*
+   ...
+   fun:call_init
    fun:_dl_init
 }
 
 {
-   dear glib - you suck at memory management
+   glib - hashtable new malloc
    Memcheck:Leak
-   fun:calloc
-   fun:g_malloc0
-   obj:*/libgobject-*
-   obj:*/libgobject-*
-   obj:*/libgobject-*
-   fun:call_init.part.0
+   match-leak-kinds: reachable
+   fun:malloc
+   ...
+   fun:g_hash_table_new_full
+   ...
+   obj:*/libglib-*
+   ...
+   fun:call_init
+   fun:_dl_init
+}
+
+{
+   glib - hashtable new malloc 2
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:g_malloc
+   ...
+   obj:*/libglib-*
+   ...
+   fun:call_init
+   fun:_dl_init
+}
+
+{
+   glib - hashtable new realloc
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:realloc
+   fun:g_realloc
+   ...
+   fun:g_hash_table_new_full
+   ...
+   obj:*/libglib-*
+   ...
+   fun:call_init
    fun:_dl_init
 }